[Python-modules-commits] [pytest-xdist] 13/18: drop fix-acceptance_test-for-pytest3.patch

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

stender pushed a commit to branch debian/master
in repository pytest-xdist.

commit d0aee34c9d321605786592e3339b4f500413d3c9
Author: Daniel Stender <stender at debian.org>
Date:   Sat Aug 5 19:41:34 2017 +0200

    drop fix-acceptance_test-for-pytest3.patch
---
 debian/changelog                                     |  5 +++--
 debian/patches/fix-acceptance_test-for-pytest3.patch | 17 -----------------
 debian/patches/series                                |  1 -
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2e7141..024fae4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pytest-xdist (1.15.0-4) UNRELEASED; urgency=medium
 
-  * New upstream release (Closes: #864360).
+  * New upstream release (Closes: #864360):
+    + drop fix-acceptance_test-for-pytest3.patch (solved upstream).
   * deb/control:
     + add DPMT as Uploaders.
     + update Vcs fields (Git repo moved to /git/python-modules).
@@ -15,7 +16,7 @@ pytest-xdist (1.15.0-4) UNRELEASED; urgency=medium
   * use debhelper level 10 (changes in deb/control and deb/compat).
   * add temporarily-disable-test_looponfail_removed_test.patch (Closes: #869094).
 
- -- Daniel Stender <stender at debian.org>  Sat, 05 Aug 2017 19:36:46 +0200
+ -- Daniel Stender <stender at debian.org>  Sat, 05 Aug 2017 19:40:18 +0200
 
 pytest-xdist (1.15.0-3) unstable; urgency=medium
 
diff --git a/debian/patches/fix-acceptance_test-for-pytest3.patch b/debian/patches/fix-acceptance_test-for-pytest3.patch
deleted file mode 100644
index 6f12813..0000000
--- a/debian/patches/fix-acceptance_test-for-pytest3.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: fix testing/acceptance_test.py::TestDistribution::
- test_manytests_to_one_import_error for Pytest 3.0.
-Origin: https://github.com/nicoddemus/pytest-xdist/commit/eafd369
-Bug: https://github.com/pytest-dev/pytest-xdist/issues/99
-Last-Update: 2016-12-05
-
---- a/testing/acceptance_test.py
-+++ b/testing/acceptance_test.py
-@@ -62,7 +62,7 @@
-                 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/debian/patches/series b/debian/patches/series
index f2db883..d473e9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 temporarily-disable-test_looponfail_removed_test.patch
-fix-acceptance_test-for-pytest3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pytest-xdist.git