mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-25 19:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-46425: Fix direct invocation of test_contextlib (GH-30681)

Browse source
This commit is contained in:
Nikita Sobolev 2022-01-21 10:36:19 +03:00 • committed by GitHub
parent d013b24135
commit 22f73bd9f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_contextlib.py
View file

@ -1117,9 +1117,15 @@ class TestSuppress(unittest.TestCase):
class TestChdir(unittest.TestCase): class TestChdir(unittest.TestCase):
def make_relative_path(self, *parts):
return os.path.join(
os.path.dirname(os.path.realpath(__file__)),
*parts,
)
def test_simple(self): def test_simple(self):
old_cwd = os.getcwd() old_cwd = os.getcwd()
target = os.path.join(os.path.dirname(__file__), 'data') target = self.make_relative_path('data')
self.assertNotEqual(old_cwd, target) self.assertNotEqual(old_cwd, target)
with chdir(target): with chdir(target):
@ -1128,8 +1134,8 @@ class TestChdir(unittest.TestCase):
def test_reentrant(self): def test_reentrant(self):
old_cwd = os.getcwd() old_cwd = os.getcwd()
target1 = os.path.join(os.path.dirname(__file__), 'data') target1 = self.make_relative_path('data')
target2 = os.path.join(os.path.dirname(__file__), 'ziptestdata') target2 = self.make_relative_path('ziptestdata')
self.assertNotIn(old_cwd, (target1, target2)) self.assertNotIn(old_cwd, (target1, target2))
chdir1, chdir2 = chdir(target1), chdir(target2) chdir1, chdir2 = chdir(target1), chdir(target2)
@ -1145,7 +1151,7 @@ class TestChdir(unittest.TestCase):
def test_exception(self): def test_exception(self):
old_cwd = os.getcwd() old_cwd = os.getcwd()
target = os.path.join(os.path.dirname(__file__), 'data') target = self.make_relative_path('data')
self.assertNotEqual(old_cwd, target) self.assertNotEqual(old_cwd, target)
try: try: