From ea7e19fd53d0cf8d73667db9bbfe97f49f3c1ecb Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 28 Nov 2017 01:54:56 +0000 Subject: [PATCH] python.pkgs.zope_testrunner: upstream patch for tests Upstream patch [1] does not apply because the file extension is different since [2]. [1] https://github.com/zopefoundation/zope.testrunner/pull/66 [2] https://github.com/zopefoundation/zope.testrunner/commit/666b71ecbf3f07ac2e90ecd804e3c7ad6d8ed828 (cherry picked from commit 7df685392078deac1c1ba67242b7b931bc2f00ae) We do run into this flaky test relatively often on Hydra for 17.09, too. --- pkgs/development/python-modules/zope_testrunner/default.nix | 2 ++ .../python-modules/zope_testrunner/test-selection.patch | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 pkgs/development/python-modules/zope_testrunner/test-selection.patch diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 7f2af64d9159..8b66cc5f71a7 100644 --- 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 new file mode 100644 index 000000000000..89dd7773885c --- /dev/null +++ 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()