From a0890f98d808b76e63d5fd5c9766367e051f5247 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 9 Nov 2018 01:31:53 +0100 Subject: [PATCH] tests: harden test_config_error --- testing/acceptance_test.py | 3 ++- testing/example_scripts/conftest_usageerror/conftest.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index 8917de6b2..19d7946cf 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -27,8 +27,9 @@ class TestGeneralUsage(object): def test_config_error(self, testdir): testdir.copy_example("conftest_usageerror/conftest.py") result = testdir.runpytest(testdir.tmpdir) - assert result.ret != 0 + assert result.ret == EXIT_USAGEERROR result.stderr.fnmatch_lines(["*ERROR: hello"]) + result.stdout.fnmatch_lines(["*pytest_unconfigure_called"]) def test_root_conftest_syntax_error(self, testdir): testdir.makepyfile(conftest="raise SyntaxError\n") diff --git a/testing/example_scripts/conftest_usageerror/conftest.py b/testing/example_scripts/conftest_usageerror/conftest.py index 7d0d39d3a..8973e4252 100644 --- a/testing/example_scripts/conftest_usageerror/conftest.py +++ b/testing/example_scripts/conftest_usageerror/conftest.py @@ -2,3 +2,7 @@ def pytest_configure(config): import pytest raise pytest.UsageError("hello") + + +def pytest_unconfigure(config): + print("pytest_unconfigure_called")