@@ -1,8 +1,23 @@
1−{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
2−, setuptools-scm
3−, cheroot, portend, more-itertools, zc_lockfile, routes
1+{ lib
2+, stdenv
3+, buildPythonPackage
4+, cheroot
5+, fetchPypi
46, jaraco_collections
5−, objgraph, pytest, pytest-cov, pathpy, requests-toolbelt, pytest-services
7+, more-itertools
8+, objgraph
9+, pathpy
10+, portend
11+, pytest-forked
12+, pytest-services
13+, pytestCheckHook
14+, pythonAtLeast
15+, pythonOlder
16+, requests-toolbelt
17+, routes
18+, setuptools-scm
19+, simplejson
20+, zc_lockfile
621}:
722
823buildPythonPackage rec {
@@ -24,39 +39,49 @@ buildPythonPackage rec {
2439
2540 propagatedBuildInputs = [
2641 # required
27− cheroot portend more-itertools zc_lockfile
42+ cheroot
43+ portend
44+ more-itertools
45+ zc_lockfile
2846 jaraco_collections
2947 # optional
3048 routes
49+ simplejson
3150 ];
3251
3352 checkInputs = [
34− objgraph pytest pytest-cov pathpy requests-toolbelt pytest-services
53+ objgraph
54+ pathpy
55+ pytest-forked
56+ pytest-services
57+ pytestCheckHook
58+ requests-toolbelt
3559 ];
3660
37−
38− # daemonize and autoreload tests have issue with sockets within sandbox
39− # Disable doctest plugin because times out
4061 preCheck = ''
41− substituteInPlace pytest.ini --replace "--doctest-modules" ""
42− pytest \
43− -k 'not KeyboardInterrupt and not daemonize and not Autoreload' \
44− --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \
45− --deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \
46− ${lib.optionalString stdenv.isDarwin
47− "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block --deselect=cherrypy/test/test_config_server.py"}
62+ # Disable doctest plugin because times out
63+ substituteInPlace pytest.ini \
64+ --replace "--doctest-modules" "-vvv"
65+ sed -i "/--cov/d" pytest.ini
4866 '';
4967
68+ pytestFlagsArray = [
69+ "-W"
70+ "ignore::DeprecationWarning"
71+ ];
72+
5073 disabledTests = [
5174 # Keyboard interrupt ends test suite run
52− ""
53− ""
54− ""
55− ""
75+ "KeyboardInterrupt"
76+ # daemonize and autoreload tests have issue with sockets within sandbox
77+ "daemonize"
78+ "Autoreload"
79+ ] ++ lib.optionals stdenv.isDarwin [
80+ "test_block"
5681 ];
5782
58− disabledTestPaths = [
59− ""
83+ disabledTestPaths = lib.optionals stdenv.isDarwin [
84+ "cherrypy/test/test_config_server.py"
6085 ];
6186
6287 __darwinAllowLocalNetworking = true;