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

Merge pull request #10920 from bluetech/testing-no-testdir 

testing: remove usages of testdir that sneaked back in
This commit is contained in:
Ran Benita 2023-04-18 22:49:23 +03:00 committed by GitHub
parent 14be71b234 819f5abd73
commit 11965d1c27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/acceptance_test.py
View File

@ -1299,12 +1299,12 @@ def test_no_brokenpipeerror_message(pytester: Pytester) -> None:
popen.stderr.close()
def test_function_return_non_none_warning(testdir) -> None:
testdir.makepyfile(
def test_function_return_non_none_warning(pytester: Pytester) -> None:
pytester.makepyfile(
"""
def test_stuff():
return "something"
"""
)
res = testdir.runpytest()
res = pytester.runpytest()
res.stdout.fnmatch_lines(["*Did you mean to use `assert` instead of `return`?*"])

18
testing/logging/test_reporting.py
View File

@ -1167,8 +1167,8 @@ def test_log_file_cli_subdirectories_are_successfully_created(
assert result.ret == ExitCode.OK
def test_disable_loggers(testdir):
testdir.makepyfile(
def test_disable_loggers(pytester: Pytester) -> None:
pytester.makepyfile(
"""
import logging
import os
@ -1181,13 +1181,13 @@ def test_disable_loggers(testdir):
assert caplog.record_tuples == [('test', 10, 'Visible text!')]
"""
)
result = testdir.runpytest("--log-disable=disabled", "-s")
result = pytester.runpytest("--log-disable=disabled", "-s")
assert result.ret == ExitCode.OK
assert not result.stderr.lines
def test_disable_loggers_does_not_propagate(testdir):
testdir.makepyfile(
def test_disable_loggers_does_not_propagate(pytester: Pytester) -> None:
pytester.makepyfile(
"""
import logging
import os
@ -1205,13 +1205,13 @@ def test_disable_loggers_does_not_propagate(testdir):
"""
)
result = testdir.runpytest("--log-disable=parent.child", "-s")
result = pytester.runpytest("--log-disable=parent.child", "-s")
assert result.ret == ExitCode.OK
assert not result.stderr.lines
def test_log_disabling_works_with_log_cli(testdir):
testdir.makepyfile(
def test_log_disabling_works_with_log_cli(pytester: Pytester) -> None:
pytester.makepyfile(
"""
import logging
disabled_log = logging.getLogger('disabled')
@ -1222,7 +1222,7 @@ def test_log_disabling_works_with_log_cli(testdir):
disabled_log.warning("This string will be suppressed.")
"""
)
result = testdir.runpytest(
result = pytester.runpytest(
"--log-cli-level=DEBUG",
"--log-disable=disabled",
)