dev-python/pytest-xdist: fix test_manytests_to_one_import_error

Bug: https://bugs.gentoo.org/597700
Package-Manager: Portage-2.3.3_p56, Repoman-2.3.1_p49

diff --git a/dev-python/pytest-xdist/files/1.15.0-test_manytests_to_one_import_error.patch b/dev-python/pytest-xdist/files/1.15.0-test_manytests_to_one_import_error.patch
new file mode 100644 (file)
index 0000000..9fb56f4
--- /dev/null
+++ b/dev-python/pytest-xdist/files/1.15.0-test_manytests_to_one_import_error.patch
@@ -0,0 +1,27 @@
+From e5d80645347fc7e67efdceb97df8e95d140b283d Mon Sep 17 00:00:00 2001
+From: Bruno Oliveira <nicoddemus@gmail.com>
+Date: Mon, 5 Dec 2016 19:59:19 -0200
+Subject: [PATCH] Test using pytest 3.0
+
+Fix #99
+---
+ .travis.yml                | 42 ++++++++++++++++++++++--------------------
+ appveyor.yml               | 23 +++++++++++++++++++++++
+ setup.py                   |  2 +-
+ testing/acceptance_test.py |  2 +-
+ tox.ini                    |  7 +++----
+ 5 files changed, 50 insertions(+), 26 deletions(-)
+
+diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
+index 21dfd71..2bb7bb1 100644
+--- a/testing/acceptance_test.py
++++ b/testing/acceptance_test.py
+@@ -62,7 +62,7 @@ def test_import():
+                 pass
+         """)
+         result = testdir.runpytest(p1, '--tx=popen', '--tx=popen')
+-        assert result.ret == 1
++        assert result.ret in (1, 2)
+         result.stdout.fnmatch_lines([
+             "E   ImportError: *__import_of_missing_module*",
+         ])

diff --git a/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
index 105194a271fa5a29471ede83a23863da9d56b270..27b6a3d48e52bc12a6f5c6a4ecc1431880c3b411 100644 (file)
--- a/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
@@ -32,6 +32,10 @@ DEPEND="${RDEPEND}
        )
 "
 
+PATCHES=(
+       "${FILESDIR}"/1.15.0-test_manytests_to_one_import_error.patch
+)
+
 python_test() {
        find -name __pycache__ -exec rm -r '{}' + || die
        py.test -vv || die "Tests failed under ${EPYTHON}"