floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: fix tests that require PYTEST_DISABLE_PLUGIN_AUTOLOAD to be unset

Browse Source 
Fix pytest's own tests with PYTEST_DISABLE_PLUGIN_AUTOLOAD=1.
This commit is contained in:
Daniel Hahler
2018-12-09 11:53:41 +01:00
parent 818aa4d343
commit 64ee1ee81b
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
testing/test_terminal.py
View File

@@ -1331,13 +1331,15 @@ class TestProgressOutputStyle(object):
]
)
def test_xdist_normal(self, many_tests_files, testdir):
def test_xdist_normal(self, many_tests_files, testdir, monkeypatch):
pytest.importorskip("xdist")
monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
output = testdir.runpytest("-n2")
output.stdout.re_match_lines([r"\.{20} \s+ \[100%\]"])
def test_xdist_normal_count(self, many_tests_files, testdir):
def test_xdist_normal_count(self, many_tests_files, testdir, monkeypatch):
pytest.importorskip("xdist")
monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
testdir.makeini(
"""
[pytest]
@@ -1347,8 +1349,9 @@ class TestProgressOutputStyle(object):
output = testdir.runpytest("-n2")
output.stdout.re_match_lines([r"\.{20} \s+ \[20/20\]"])
def test_xdist_verbose(self, many_tests_files, testdir):
def test_xdist_verbose(self, many_tests_files, testdir, monkeypatch):
pytest.importorskip("xdist")
monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
output = testdir.runpytest("-n2", "-v")
output.stdout.re_match_lines_random(
[
@@ -1442,7 +1445,8 @@ class TestProgressWithTeardown(object):
]
)
def test_xdist_normal(self, many_files, testdir):
def test_xdist_normal(self, many_files, testdir, monkeypatch):
pytest.importorskip("xdist")
monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
output = testdir.runpytest("-n2")
output.stdout.re_match_lines([r"[\.E]{40} \s+ \[100%\]"])