From 9a17459ba0ac5ec7ec1047e4c8e72d4e2088c912 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Fri, 11 Dec 2020 09:23:40 -0500
Subject: [PATCH] devpi-server: fix build

Build was failing due to line continuation between disabled tests in
checkPhase.
Fixed by converting to easier syntax of ``pytestCheckHook``.
---
 .../tools/devpi-server/default.nix            | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index 666a2cef7c53..7ddff92402cb 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
   checkInputs = with python3Packages; [
     beautifulsoup4
     nginx
-    pytest
+    pytestCheckHook
     pytest-flake8
     webtest
   ] ++ stdenv.lib.optionals isPy27 [ mock ];
@@ -38,15 +38,22 @@ python3Packages.buildPythonApplication rec {
   # root_passwd_hash tries to write to store
   # TestMirrorIndexThings tries to write to /var through ngnix
   # nginx tests try to write to /var
-  checkPhase = ''
-    PATH=$PATH:$out/bin HOME=$TMPDIR pytest \
-      ./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 \
-      -k 'not root_passwd_hash_option \
-          and not TestMirrorIndexThings'
+  preCheck = ''
+    export PATH=$PATH:$out/bin
+    export HOME=$TMPDIR
   '';
+  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;{
     homepage = "http://doc.devpi.net";