python.pkgs.zope_testrunner: upstream patch for tests

Upstream patch [1] does not apply because the file extension is different since [2]. [1] zopefoundation/zope.testrunner#66 [2] zopefoundation/zope.testrunner@666b71e (cherry picked from commit 7df6853) We do run into this flaky test relatively often on Hydra for 17.09, too.
NixOS · Dec 14, 2017 · ea7e19f · ea7e19f
1 parent 427756c
commit ea7e19f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -20,6 +20,8 @@ buildPythonPackage rec {
     extension = "zip";
   };
 
+  patches = [ ./test-selection.patch ];
+
   propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];
 
   meta = with stdenv.lib; {

diff --git a/pkgs/development/python-modules/zope_testrunner/test-selection.patch b/pkgs/development/python-modules/zope_testrunner/test-selection.patch
@@ -0,0 +1,5 @@
+--- a/src/zope/testrunner/tests/testrunner-test-selection.txt
++++ b/src/zope/testrunner/tests/testrunner-test-selection.txt
+@@ -235 +235 @@ and by test within the module using the --test (-t) option:
+-    >>> sys.argv = 'test -u  -vv -ssample1 -m_one -mtest1 -tx0 -ty0'.split()
++    >>> sys.argv = 'test -u  -vv -ssample1 -m_one -mtest1 -t_x0 -t_y0'.split()