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

Merge pull request #6536 from blueyed/fix-test_cwd_snapshot 

tests: fix test_cwd_snapshot
This commit is contained in:
Daniel Hahler 2020-01-22 16:46:04 +01:00 committed by GitHub
parent ba49581510 b8787b8732
commit 85df6bbe26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_pytest/pytester.py
View File

@ -527,6 +527,8 @@ class Testdir:
""" """
__test__ = False
CLOSE_STDIN = object CLOSE_STDIN = object
class TimeoutExpired(Exception): class TimeoutExpired(Exception):

4
testing/test_pytester.py
View File

@ -16,6 +16,7 @@ from _pytest.pytester import HookRecorder
from _pytest.pytester import LineMatcher from _pytest.pytester import LineMatcher
from _pytest.pytester import SysModulesSnapshot from _pytest.pytester import SysModulesSnapshot
from _pytest.pytester import SysPathsSnapshot from _pytest.pytester import SysPathsSnapshot
from _pytest.pytester import Testdir
def test_make_hook_recorder(testdir) -> None: 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) 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) foo = tmpdir.ensure("foo", dir=1)
bar = tmpdir.ensure("bar", dir=1) bar = tmpdir.ensure("bar", dir=1)
foo.chdir() foo.chdir()