about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2017-05-12 08:36:25 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2017-05-15 14:14:51 +0200
commite5a4da2ab8687c52d140653cc0fb17e2344f48a6 (patch)
treee2d5e8530611f76795cddac990bbea6b11e6d422
parenta35ec5dda688f6eedbb281671ee11261c769610e (diff)
downloadnixlib-e5a4da2ab8687c52d140653cc0fb17e2344f48a6.tar
nixlib-e5a4da2ab8687c52d140653cc0fb17e2344f48a6.tar.gz
nixlib-e5a4da2ab8687c52d140653cc0fb17e2344f48a6.tar.bz2
nixlib-e5a4da2ab8687c52d140653cc0fb17e2344f48a6.tar.lz
nixlib-e5a4da2ab8687c52d140653cc0fb17e2344f48a6.tar.xz
nixlib-e5a4da2ab8687c52d140653cc0fb17e2344f48a6.tar.zst
nixlib-e5a4da2ab8687c52d140653cc0fb17e2344f48a6.zip
python-pytest-xdist: fix tests
-rw-r--r--pkgs/development/python-modules/pytest-xdist/default.nix29
-rw-r--r--pkgs/top-level/python-packages.nix18
2 files changed, 30 insertions, 17 deletions
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
new file mode 100644
index 000000000000..05f4d5bd1f2c
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchzip, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pytest-xdist";
+  version = "1.14";
+
+  src = fetchzip {
+    url = "mirror://pypi/p/pytest-xdist/${name}.zip";
+    sha256 = "18j6jq4r47cbbgnci0bbp0kjr9w12hzw7fh4dmsbm072jmv8c0gx";
+  };
+
+  buildInputs = [ pytest setuptools_scm ];
+  propagatedBuildInputs = [ execnet ];
+
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    rm testing/acceptance_test.py testing/test_remote.py testing/test_slavemanage.py
+  '';
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
+    homepage = https://github.com/pytest-dev/pytest-xdist;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fcef975b0484..4093dac55c84 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5297,23 +5297,7 @@ in {
     };
   };
 
-  pytest_xdist = buildPythonPackage rec {
-    name = "pytest-xdist-1.14";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest-xdist/${name}.zip";
-      sha256 = "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja";
-    };
-
-    buildInputs = with self; [ pytest setuptools_scm ];
-    propagatedBuildInputs = with self; [ execnet ];
-
-    meta = {
-      description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
-      homepage = https://github.com/pytest-dev/pytest-xdist;
-      license = licenses.mit;
-    };
-  };
+  pytest_xdist = callPackage ../development/python-modules/pytest-xdist { };
 
   pytest-localserver = buildPythonPackage rec {
     name = "pytest-localserver-${version}";