diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2017-02-18 12:12:54 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2017-02-18 12:13:11 -0500 |
| commit | 0d0f8ba34d9809e980807c9bd76d46c5c00a97a1 (patch) | |
| tree | b2828d3433cc386fc57cf14a6974c3000081ee62 /dev-python/pytest-xdist | |
| parent | media-sound/aqualung: Add USE=libav (diff) | |
| download | gentoo-0d0f8ba34d9809e980807c9bd76d46c5c00a97a1.tar.gz gentoo-0d0f8ba34d9809e980807c9bd76d46c5c00a97a1.tar.bz2 gentoo-0d0f8ba34d9809e980807c9bd76d46c5c00a97a1.zip | |
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
Diffstat (limited to 'dev-python/pytest-xdist')
| -rw-r--r-- | dev-python/pytest-xdist/files/1.15.0-test_manytests_to_one_import_error.patch | 27 | ||||
| -rw-r--r-- | dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild | 4 |
2 files changed, 31 insertions, 0 deletions
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 index 000000000000..9fb56f419ceb --- /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 105194a271fa..27b6a3d48e52 100644 --- 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}" |