Merge pull request #8168 from antonblr/testdir-to-pytester-incr2

tests: Migrate to pytester - final update

Author: bluetech

src/_pytest/nodes.py

@@ -528,7 +528,7 @@ def gethookproxy(self, fspath: "os.PathLike[str]"):
         warnings.warn(FSCOLLECTOR_GETHOOKPROXY_ISINITPATH, stacklevel=2)
         return self.session.gethookproxy(fspath)
 
-    def isinitpath(self, path: py.path.local) -> bool:
+    def isinitpath(self, path: Union[str, "os.PathLike[str]"]) -> bool:
         warnings.warn(FSCOLLECTOR_GETHOOKPROXY_ISINITPATH, stacklevel=2)
         return self.session.isinitpath(path)
 

src/_pytest/python.py

@@ -660,7 +660,7 @@ def gethookproxy(self, fspath: "os.PathLike[str]"):
         warnings.warn(FSCOLLECTOR_GETHOOKPROXY_ISINITPATH, stacklevel=2)
         return self.session.gethookproxy(fspath)
 
-    def isinitpath(self, path: py.path.local) -> bool:
+    def isinitpath(self, path: Union[str, "os.PathLike[str]"]) -> bool:
         warnings.warn(FSCOLLECTOR_GETHOOKPROXY_ISINITPATH, stacklevel=2)
         return self.session.isinitpath(path)
 

testing/deprecated_test.py

@@ -5,24 +5,23 @@
 import pytest
 from _pytest import deprecated
 from _pytest.pytester import Pytester
-from _pytest.pytester import Testdir
 
 
 @pytest.mark.parametrize("attribute", pytest.collect.__all__)  # type: ignore
 # false positive due to dynamic attribute
-def test_pytest_collect_module_deprecated(attribute):
+def test_pytest_collect_module_deprecated(attribute) -> None:
     with pytest.warns(DeprecationWarning, match=attribute):
         getattr(pytest.collect, attribute)
 
 
 @pytest.mark.parametrize("plugin", sorted(deprecated.DEPRECATED_EXTERNAL_PLUGINS))
 @pytest.mark.filterwarnings("default")
-def test_external_plugins_integrated(testdir, plugin):
-    testdir.syspathinsert()
-    testdir.makepyfile(**{plugin: ""})
+def test_external_plugins_integrated(pytester: Pytester, plugin) -> None:
+    pytester.syspathinsert()
+    pytester.makepyfile(**{plugin: ""})
 
     with pytest.warns(pytest.PytestConfigWarning):
-        testdir.parseconfig("-p", plugin)
+        pytester.parseconfig("-p", plugin)
 
 
 def test_fillfuncargs_is_deprecated() -> None:
@@ -49,32 +48,32 @@ def test_fillfixtures_is_deprecated() -> None:
         _pytest.fixtures.fillfixtures(mock.Mock())
 
 
-def test_minus_k_dash_is_deprecated(testdir) -> None:
-    threepass = testdir.makepyfile(
+def test_minus_k_dash_is_deprecated(pytester: Pytester) -> None:
+    threepass = pytester.makepyfile(
         test_threepass="""
         def test_one(): assert 1
         def test_two(): assert 1
         def test_three(): assert 1
     """
     )
-    result = testdir.runpytest("-k=-test_two", threepass)
+    result = pytester.runpytest("-k=-test_two", threepass)
     result.stdout.fnmatch_lines(["*The `-k '-expr'` syntax*deprecated*"])
 
 
-def test_minus_k_colon_is_deprecated(testdir) -> None:
-    threepass = testdir.makepyfile(
+def test_minus_k_colon_is_deprecated(pytester: Pytester) -> None:
+    threepass = pytester.makepyfile(
         test_threepass="""
         def test_one(): assert 1
         def test_two(): assert 1
         def test_three(): assert 1
     """
     )
-    result = testdir.runpytest("-k", "test_two:", threepass)
+    result = pytester.runpytest("-k", "test_two:", threepass)
     result.stdout.fnmatch_lines(["*The `-k 'expr:'` syntax*deprecated*"])
 
 
-def test_fscollector_gethookproxy_isinitpath(testdir: Testdir) -> None:
-    module = testdir.getmodulecol(
+def test_fscollector_gethookproxy_isinitpath(pytester: Pytester) -> None:
+    module = pytester.getmodulecol(
         """
         def test_foo(): pass
         """,
@@ -85,16 +84,16 @@ def test_foo(): pass
     assert isinstance(package, pytest.Package)
 
     with pytest.warns(pytest.PytestDeprecationWarning, match="gethookproxy"):
-        package.gethookproxy(testdir.tmpdir)
+        package.gethookproxy(pytester.path)
 
     with pytest.warns(pytest.PytestDeprecationWarning, match="isinitpath"):
-        package.isinitpath(testdir.tmpdir)
+        package.isinitpath(pytester.path)
 
     # The methods on Session are *not* deprecated.
     session = module.session
     with warnings.catch_warnings(record=True) as rec:
-        session.gethookproxy(testdir.tmpdir)
-        session.isinitpath(testdir.tmpdir)
+        session.gethookproxy(pytester.path)
+        session.isinitpath(pytester.path)
     assert len(rec) == 0
 
 

testing/test_cacheprovider.py

@@ -1050,7 +1050,7 @@ def test_packages(self, pytester: Pytester) -> None:
 
 
 class TestNewFirst:
-    def test_newfirst_usecase(self, pytester: Pytester, testdir) -> None:
+    def test_newfirst_usecase(self, pytester: Pytester) -> None:
         pytester.makepyfile(
             **{
                 "test_1/test_1.py": """

testing/test_collection.py

@@ -6,6 +6,8 @@
 from pathlib import Path
 from typing import List
 
+import py.path
+
 import pytest
 from _pytest.config import ExitCode
 from _pytest.fixtures import FixtureRequest
@@ -16,7 +18,6 @@
 from _pytest.pathlib import symlink_or_skip
 from _pytest.pytester import HookRecorder
 from _pytest.pytester import Pytester
-from _pytest.pytester import Testdir
 
 
 def ensure_file(file_path: Path) -> Path:
@@ -206,15 +207,17 @@ def test_ignored_virtualenvs_norecursedirs_precedence(
             "Activate.ps1",
         ),
     )
-    def test__in_venv(self, testdir: Testdir, fname: str) -> None:
+    def test__in_venv(self, pytester: Pytester, fname: str) -> None:
         """Directly test the virtual env detection function"""
         bindir = "Scripts" if sys.platform.startswith("win") else "bin"
         # no bin/activate, not a virtualenv
-        base_path = testdir.tmpdir.mkdir("venv")
-        assert _in_venv(base_path) is False
+        base_path = pytester.mkdir("venv")
+        assert _in_venv(py.path.local(base_path)) is False
         # with bin/activate, totally a virtualenv
-        base_path.ensure(bindir, fname)
-        assert _in_venv(base_path) is True
+        bin_path = base_path.joinpath(bindir)
+        bin_path.mkdir()
+        bin_path.joinpath(fname).touch()
+        assert _in_venv(py.path.local(base_path)) is True
 
     def test_custom_norecursedirs(self, pytester: Pytester) -> None:
         pytester.makeini(
@@ -264,7 +267,7 @@ def test_testpaths_ini(self, pytester: Pytester, monkeypatch: MonkeyPatch) -> No
 
 
 class TestCollectPluginHookRelay:
-    def test_pytest_collect_file(self, testdir: Testdir) -> None:
+    def test_pytest_collect_file(self, pytester: Pytester) -> None:
         wascalled = []
 
         class Plugin:
@@ -273,8 +276,8 @@ def pytest_collect_file(self, path):
                     # Ignore hidden files, e.g. .testmondata.
                     wascalled.append(path)
 
-        testdir.makefile(".abc", "xyz")
-        pytest.main(testdir.tmpdir, plugins=[Plugin()])
+        pytester.makefile(".abc", "xyz")
+        pytest.main(py.path.local(pytester.path), plugins=[Plugin()])
         assert len(wascalled) == 1
         assert wascalled[0].ext == ".abc"
 
@@ -1336,7 +1339,7 @@ def test_does_not_put_src_on_path(pytester: Pytester) -> None:
     assert result.ret == ExitCode.OK
 
 
-def test_fscollector_from_parent(testdir: Testdir, request: FixtureRequest) -> None:
+def test_fscollector_from_parent(pytester: Pytester, request: FixtureRequest) -> None:
     """Ensure File.from_parent can forward custom arguments to the constructor.
 
     Context: https://github.com/pytest-dev/pytest-cpp/pull/47
@@ -1352,7 +1355,7 @@ def from_parent(cls, parent, *, fspath, x):
             return super().from_parent(parent=parent, fspath=fspath, x=x)
 
     collector = MyCollector.from_parent(
-        parent=request.session, fspath=testdir.tmpdir / "foo", x=10
+        parent=request.session, fspath=py.path.local(pytester.path) / "foo", x=10
     )
     assert collector.x == 10
 

testing/test_debugging.py

@@ -24,8 +24,8 @@
 def pdb_env(request):
     if "pytester" in request.fixturenames:
         # Disable pdb++ with inner tests.
-        pytester = request.getfixturevalue("testdir")
-        pytester.monkeypatch.setenv("PDBPP_HIJACK_PDB", "0")
+        pytester = request.getfixturevalue("pytester")
+        pytester._monkeypatch.setenv("PDBPP_HIJACK_PDB", "0")
 
 
 def runpdb_and_get_report(pytester: Pytester, source: str):