diff --git a/tests/helpers/test_logfail.py b/tests/helpers/test_logfail.py index c66eb9296..b2c879c95 100644 --- a/tests/helpers/test_logfail.py +++ b/tests/helpers/test_logfail.py @@ -39,26 +39,26 @@ def log_testdir(testdir): return testdir -def test_log_debug(log_testdir): - log_testdir.makepyfile(""" +def test_log_debug(testdir): + testdir.makepyfile(""" import logging def test_foo(): logging.debug('foo') """) - res = log_testdir.runpytest('-p capturelog') - res.stdout.fnmatch_lines(['*1 passed*']) + res = testdir.inline_run() + res.assertoutcome(passed=1) -def test_log_warning(log_testdir): - log_testdir.makepyfile(""" +def test_log_warning(testdir): + testdir.makepyfile(""" import logging def test_foo(): logging.warning('foo') """) - res = log_testdir.runpytest('-p capturelog') - res.stdout.fnmatch_lines(['*1 error*']) + res = testdir.inline_run() + res.assertoutcome(failed=1) def test_log_expected(log_testdir): @@ -71,11 +71,11 @@ def test_log_expected(log_testdir): logging.error('foo') """) res = log_testdir.runpytest('-p capturelog') - res.stdout.fnmatch_lines(['*1 passed*']) + res.stdout.fnmatch_lines(['*1 passed in*']) -def test_log_expected_logger(log_testdir): - log_testdir.makepyfile(""" +def test_log_expected_logger(testdir): + testdir.makepyfile(""" import logging def test_foo(caplog): @@ -83,24 +83,24 @@ def test_log_expected_logger(log_testdir): with caplog.atLevel(logging.ERROR, logger): logging.getLogger(logger).error('foo') """) - res = log_testdir.runpytest('-p capturelog') - res.stdout.fnmatch_lines(['*1 passed*']) + res = testdir.inline_run() + res.assertoutcome(passed=1) -def test_log_expected_wrong_level(log_testdir): - log_testdir.makepyfile(""" +def test_log_expected_wrong_level(testdir): + testdir.makepyfile(""" import logging def test_foo(caplog): with caplog.atLevel(logging.ERROR): logging.critical('foo') """) - res = log_testdir.runpytest('-p capturelog') - res.stdout.fnmatch_lines(['*1 error*']) + res = testdir.inline_run() + res.assertoutcome(failed=1) -def test_log_expected_logger_wrong_level(log_testdir): - log_testdir.makepyfile(""" +def test_log_expected_logger_wrong_level(testdir): + testdir.makepyfile(""" import logging def test_foo(caplog): @@ -108,12 +108,12 @@ def test_log_expected_logger_wrong_level(log_testdir): with caplog.atLevel(logging.ERROR, logger): logging.getLogger(logger).critical('foo') """) - res = log_testdir.runpytest('-p capturelog') - res.stdout.fnmatch_lines(['*1 error*']) + res = testdir.inline_run() + res.assertoutcome(failed=1) -def test_log_expected_wrong_logger(log_testdir): - log_testdir.makepyfile(""" +def test_log_expected_wrong_logger(testdir): + testdir.makepyfile(""" import logging def test_foo(caplog): @@ -121,8 +121,8 @@ def test_log_expected_wrong_logger(log_testdir): with caplog.atLevel(logging.ERROR, logger): logging.error('foo') """) - res = log_testdir.runpytest('-p capturelog') - res.stdout.fnmatch_lines(['*1 error*']) + res = testdir.inline_run() + res.assertoutcome(failed=1) @pytest.fixture