summaryrefslogtreecommitdiff
path: root/testing/acceptance_test.py
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2020-02-14 17:00:01 +0100
committerGitHub <noreply@github.com>2020-02-14 17:00:01 +0100
commit4b70ba2c2113cc1fed40c4db04f31df8990d6a2c (patch)
tree8ba6b23325ef2f84637a40e210944dbc503abfbd /testing/acceptance_test.py
parentde3353aac14cf612dd563fe48b58503e9468de1e (diff)
downloadpytest-4b70ba2c2113cc1fed40c4db04f31df8990d6a2c.tar.gz
tests: harden test_better_reporting_on_conftest_load_failure (#6713)
Diffstat (limited to 'testing/acceptance_test.py')
-rw-r--r--testing/acceptance_test.py26
1 files changed, 11 insertions, 15 deletions
diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
index 4cbaebeb1..c7c16d60d 100644
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -190,10 +190,10 @@ class TestGeneralUsage:
)
@pytest.mark.filterwarnings("default")
- def test_better_reporting_on_conftest_load_failure(self, testdir, request):
+ def test_better_reporting_on_conftest_load_failure(self, testdir):
"""Show a user-friendly traceback on conftest import failures (#486, #3332)"""
testdir.makepyfile("")
- testdir.makeconftest(
+ conftest = testdir.makeconftest(
"""
def foo():
import qwerty
@@ -208,22 +208,18 @@ class TestGeneralUsage:
"""
)
result = testdir.runpytest()
- dirname = request.node.name + "0"
exc_name = (
"ModuleNotFoundError" if sys.version_info >= (3, 6) else "ImportError"
)
- result.stderr.fnmatch_lines(
- [
- "ImportError while loading conftest '*{sep}{dirname}{sep}conftest.py'.".format(
- dirname=dirname, sep=os.sep
- ),
- "conftest.py:3: in <module>",
- " foo()",
- "conftest.py:2: in foo",
- " import qwerty",
- "E {}: No module named 'qwerty'".format(exc_name),
- ]
- )
+ assert result.stdout.lines == []
+ assert result.stderr.lines == [
+ "ImportError while loading conftest '{}'.".format(conftest),
+ "conftest.py:3: in <module>",
+ " foo()",
+ "conftest.py:2: in foo",
+ " import qwerty",
+ "E {}: No module named 'qwerty'".format(exc_name),
+ ]
def test_early_skip(self, testdir):
testdir.mkdir("xyz")