jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use public API for adding config cleanup 

No need to spuriously access the private internals of Config.
This commit is contained in:
Ran Benita 2021-10-22 10:41:20 +03:00
parent 61e506a63f
commit 5fd182f3de
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_pytest/debugging.py
View File

@ -88,7 +88,7 @@ def pytest_configure(config: Config) -> None:
pytestPDB._config, pytestPDB._config,
) = pytestPDB._saved.pop() ) = pytestPDB._saved.pop()
config._cleanup.append(fin) config.add_cleanup(fin)
class pytestPDB: class pytestPDB:

2
src/_pytest/skipping.py
View File

@ -49,7 +49,7 @@ def pytest_configure(config: Config) -> None:
import pytest import pytest
old = pytest.xfail old = pytest.xfail
config._cleanup.append(lambda: setattr(pytest, "xfail", old)) config.add_cleanup(lambda: setattr(pytest, "xfail", old))
def nop(*args, **kwargs): def nop(*args, **kwargs):
pass pass

10
src/_pytest/tmpdir.py
View File

@ -199,11 +199,11 @@ def pytest_configure(config: Config) -> None:
to the tmp_path_factory session fixture. to the tmp_path_factory session fixture.
""" """
mp = MonkeyPatch() mp = MonkeyPatch()
tmppath_handler = TempPathFactory.from_config(config, _ispytest=True) config.add_cleanup(mp.undo)
t = TempdirFactory(tmppath_handler, _ispytest=True) _tmp_path_factory = TempPathFactory.from_config(config, _ispytest=True)
config._cleanup.append(mp.undo) _tmpdirhandler = TempdirFactory(_tmp_path_factory, _ispytest=True)
mp.setattr(config, "_tmp_path_factory", tmppath_handler, raising=False) mp.setattr(config, "_tmp_path_factory", _tmp_path_factory, raising=False)
mp.setattr(config, "_tmpdirhandler", t, raising=False) mp.setattr(config, "_tmpdirhandler", _tmpdirhandler, raising=False)
@fixture(scope="session") @fixture(scope="session")

4
testing/test_debugging.py
View File

@ -934,7 +934,7 @@ class TestDebuggingBreakpoints:
from _pytest.debugging import pytestPDB from _pytest.debugging import pytestPDB
def pytest_configure(config): def pytest_configure(config):
config._cleanup.append(check_restored) config.add_cleanup(check_restored)
def check_restored(): def check_restored():
assert sys.breakpointhook == sys.__breakpointhook__ assert sys.breakpointhook == sys.__breakpointhook__
@ -983,7 +983,7 @@ class TestDebuggingBreakpoints:
os.environ['PYTHONBREAKPOINT'] = '_pytest._CustomDebugger.set_trace' os.environ['PYTHONBREAKPOINT'] = '_pytest._CustomDebugger.set_trace'
def pytest_configure(config): def pytest_configure(config):
config._cleanup.append(check_restored) config.add_cleanup(check_restored)
def check_restored(): def check_restored():
assert sys.breakpointhook == sys.__breakpointhook__ assert sys.breakpointhook == sys.__breakpointhook__