[patch] Patch to adapt to new output format of pytest >= 3.0.0

pytest-xdist-1.15.0-Fix_test_n1_import_error.patch (text/plain), 1.19 KB, created by Maram on 2017-02-19 12:33:25 UTC

Subject: Adapt acceptance_test.py to new pytest output format

The test test_n1_import_error in testing/acceptance_test.py does some
regex matching against the output of pytest. However, since pytest-3.0.0
the output has changed slightly.

This patch adjust the matching patterns to match both the new and the old
format. Note, however, that due to this the patterns are quite generic.

diff -ur a/testing/acceptance_test.py b/testing/acceptance_test.py
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -30,7 +30,8 @@
         result = testdir.runpytest(p1, "-n1")
         assert result.ret == 1
         result.stdout.fnmatch_lines([
-            "E   ImportError: *__import_of_missing_module*",
+            "*ImportError*",
+            "*__import_of_missing_module*",
         ])
 
     def test_n2_import_error(self, testdir):
@@ -64,7 +65,8 @@
         result = testdir.runpytest(p1, '--tx=popen', '--tx=popen')
         assert result.ret == 1
         result.stdout.fnmatch_lines([
-            "E   ImportError: *__import_of_missing_module*",
+            "*ImportError*",
+            "*__import_of_missing_module*",
         ])
 
     def test_manytests_to_one_popen(self, testdir):