Merge pull request #6536 from blueyed/fix-test_cwd_snapshot

tests: fix test_cwd_snapshot
pytest-dev · Jan 22, 2020 · 85df6bb · 85df6bb
2 parents ba49581 + b8787b8
commit 85df6bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
@@ -527,6 +527,8 @@ class Testdir:
 
     """
 
+    __test__ = False
+
     CLOSE_STDIN = object
 
     class TimeoutExpired(Exception):

diff --git a/testing/test_pytester.py b/testing/test_pytester.py
@@ -16,6 +16,7 @@
 from _pytest.pytester import LineMatcher
 from _pytest.pytester import SysModulesSnapshot
 from _pytest.pytester import SysPathsSnapshot
+from _pytest.pytester import Testdir
 
 
 def test_make_hook_recorder(testdir) -> None:
@@ -273,7 +274,8 @@ def test_assert_outcomes_after_pytest_error(testdir) -> None:
         result.assert_outcomes(passed=0)
 
 
-def test_cwd_snapshot(tmpdir) -> None:
+def test_cwd_snapshot(testdir: Testdir) -> None:
+    tmpdir = testdir.tmpdir
     foo = tmpdir.ensure("foo", dir=1)
     bar = tmpdir.ensure("bar", dir=1)
     foo.chdir()