Commit 04054d9a authored by Victor Stinner's avatar Victor Stinner

Update test_support for my temp_dir/change_cwd changes

parent edb48814
......@@ -985,7 +985,7 @@ def change_cwd(path, quiet=False):
except OSError as exc:
if not quiet:
raise
warnings.warn(f'tests may fail, unable to change current working '
warnings.warn(f'tests may fail, unable to change the current working '
f'directory to {path}: {exc}',
RuntimeWarning, stacklevel=3)
try:
......
......@@ -155,8 +155,11 @@ class TestSupport(unittest.TestCase):
finally:
shutil.rmtree(path)
expected = ['tests may fail, unable to create temp dir: ' + path]
self.assertEqual(warnings, expected)
self.assertEqual(len(warnings), 1, warnings)
warn = warnings[0]
self.assertTrue(warn.startswith(f'tests may fail, unable to create '
f'temporary directory {path}: '),
warn)
# Tests for change_cwd()
......@@ -197,8 +200,12 @@ class TestSupport(unittest.TestCase):
self.assertEqual(os.getcwd(), new_cwd)
warnings = [str(w.message) for w in recorder.warnings]
expected = ['tests may fail, unable to change CWD to: ' + bad_dir]
self.assertEqual(warnings, expected)
self.assertEqual(len(warnings), 1, warnings)
warn = warnings[0]
self.assertTrue(warn.startswith(f'tests may fail, unable to change '
f'the current working directory '
f'to {bad_dir}: '),
warn)
# Tests for change_cwd()
......@@ -209,7 +216,13 @@ class TestSupport(unittest.TestCase):
with support.change_cwd(path=path, quiet=True):
pass
messages = [str(w.message) for w in recorder.warnings]
self.assertEqual(messages, ['tests may fail, unable to change CWD to: ' + path])
self.assertEqual(len(messages), 1, messages)
msg = messages[0]
self.assertTrue(msg.startswith(f'tests may fail, unable to change '
f'the current working directory '
f'to {path}: '),
msg)
# Tests for temp_cwd()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment