p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CI for Python 3.11 

Getting the current working directory has no side-effects, so these context managers were no-ops.
Discovered because Path.__enter__ is deprecated in Python 3.11, for removal in 3.13.
This commit is contained in:
Zac Hatfield-Dodds 2022-03-20 21:01:26 -07:00
parent e9dd3dffab
commit 0ebfa1d76d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
testing/test_collection.py
View File

@ -660,8 +660,7 @@ class Test_getinitialnodes:
subdir = tmp_path.joinpath("subdir") subdir = tmp_path.joinpath("subdir")
x = ensure_file(subdir / "x.py") x = ensure_file(subdir / "x.py")
ensure_file(subdir / "__init__.py") ensure_file(subdir / "__init__.py")
with subdir.cwd(): config = pytester.parseconfigure(x)
config = pytester.parseconfigure(x)
col = pytester.getnode(config, x) col = pytester.getnode(config, x)
assert col is not None assert col is not None
assert col.name == "x.py" assert col.name == "x.py"
@ -1188,8 +1187,7 @@ def test_collect_with_chdir_during_import(pytester: Pytester) -> None:
""" """
% (str(subdir),) % (str(subdir),)
) )
with pytester.path.cwd(): result = pytester.runpytest()
result = pytester.runpytest()
result.stdout.fnmatch_lines(["*1 passed in*"]) result.stdout.fnmatch_lines(["*1 passed in*"])
assert result.ret == 0 assert result.ret == 0
@ -1200,8 +1198,7 @@ def test_collect_with_chdir_during_import(pytester: Pytester) -> None:
testpaths = . testpaths = .
""" """
) )
with pytester.path.cwd(): result = pytester.runpytest("--collect-only")
result = pytester.runpytest("--collect-only")
result.stdout.fnmatch_lines(["collected 1 item"]) result.stdout.fnmatch_lines(["collected 1 item"])
@ -1224,8 +1221,7 @@ def test_collect_pyargs_with_testpaths(
) )
) )
monkeypatch.setenv("PYTHONPATH", str(pytester.path), prepend=os.pathsep) monkeypatch.setenv("PYTHONPATH", str(pytester.path), prepend=os.pathsep)
with root.cwd(): result = pytester.runpytest_subprocess()
result = pytester.runpytest_subprocess()
result.stdout.fnmatch_lines(["*1 passed in*"]) result.stdout.fnmatch_lines(["*1 passed in*"])