Use ImportError in Python 3.5

nicoddemus · nicoddemus · commit 0ad23a76c14b · 2020-05-31T12:48:05.000-03:00
diff --git a/testing/test_collection.py b/testing/test_collection.py
@@ -1423,10 +1423,13 @@ def test_modules_not_importable_as_side_effect(self, testdir):
         """
         self.setup_conftest_and_foo(testdir)
         result = testdir.runpytest("-v", "--import-mode=importlib")
+        exc_name = (
+            "ModuleNotFoundError" if sys.version_info[:2] > (3, 5) else "ImportError"
+        )
         result.stdout.fnmatch_lines(
             [
-                "*ModuleNotFoundError: No module named 'foo'",
-                "tests?test_foo.py:2: ModuleNotFoundError",
+                "*{}: No module named 'foo'".format(exc_name),
+                "tests?test_foo.py:2: {}".format(exc_name),
                 "* 1 failed in *",
             ]
         )

Original file line number	Diff line number	Diff line change
`@@ -1423,10 +1423,13 @@ def test_modules_not_importable_as_side_effect(self, testdir):`
`1423`	`1423`	`"""`
`1424`	`1424`	`self.setup_conftest_and_foo(testdir)`
`1425`	`1425`	`result = testdir.runpytest("-v", "--import-mode=importlib")`
	`1426`	`+ exc_name = (`
	`1427`	`+ "ModuleNotFoundError" if sys.version_info[:2] > (3, 5) else "ImportError"`
	`1428`	`+ )`
`1426`	`1429`	`result.stdout.fnmatch_lines(`
`1427`	`1430`	`[`
`1428`		`- "*ModuleNotFoundError: No module named 'foo'",`
`1429`		`- "tests?test_foo.py:2: ModuleNotFoundError",`
	`1431`	`+ "*{}: No module named 'foo'".format(exc_name),`
	`1432`	`+ "tests?test_foo.py:2: {}".format(exc_name),`
`1430`	`1433`	`"* 1 failed in *",`
`1431`	`1434`	`]`
`1432`	`1435`	`)`