devpi-server: fix build

Build was failing due to line continuation between disabled tests in
checkPhase.
Fixed by converting to easier syntax of ``pytestCheckHook``.
This commit is contained in:
Drew Risinger 2020-12-11 09:23:40 -05:00
parent 539d6cf79a
commit 9a17459ba0

View File

@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [ checkInputs = with python3Packages; [
beautifulsoup4 beautifulsoup4
nginx nginx
pytest pytestCheckHook
pytest-flake8 pytest-flake8
webtest webtest
] ++ stdenv.lib.optionals isPy27 [ mock ]; ] ++ stdenv.lib.optionals isPy27 [ mock ];
@ -38,15 +38,22 @@ python3Packages.buildPythonApplication rec {
# root_passwd_hash tries to write to store # root_passwd_hash tries to write to store
# TestMirrorIndexThings tries to write to /var through ngnix # TestMirrorIndexThings tries to write to /var through ngnix
# nginx tests try to write to /var # nginx tests try to write to /var
checkPhase = '' preCheck = ''
PATH=$PATH:$out/bin HOME=$TMPDIR pytest \ export PATH=$PATH:$out/bin
./test_devpi_server --slow -rfsxX \ export HOME=$TMPDIR
--ignore=test_devpi_server/test_nginx_replica.py \
--ignore=test_devpi_server/test_streaming_nginx.py \
--ignore=test_devpi_server/test_streaming_replica_nginx.py \
-k 'not root_passwd_hash_option \
and not TestMirrorIndexThings'
''; '';
pytestFlagsArray = [
"./test_devpi_server"
"--slow"
"-rfsxX"
"--ignore=test_devpi_server/test_nginx_replica.py"
"--ignore=test_devpi_server/test_streaming_nginx.py"
"--ignore=test_devpi_server/test_streaming_replica_nginx.py"
];
disabledTests = [
"root_passwd_hash_option"
"TestMirrorIndexThings"
];
meta = with stdenv.lib;{ meta = with stdenv.lib;{
homepage = "http://doc.devpi.net"; homepage = "http://doc.devpi.net";