Kaydet (Commit) 050a61f8 authored tarafından Ezio Melotti's avatar Ezio Melotti

#15304: merge with 3.2.

...@@ -680,7 +680,7 @@ def temp_cwd(name='tempcwd', quiet=False, path=None): ...@@ -680,7 +680,7 @@ def temp_cwd(name='tempcwd', quiet=False, path=None):
except OSError: except OSError:
if not quiet: if not quiet:
raise raise
warnings.warn('tests may fail, unable to change the CWD to ' + name, warnings.warn('tests may fail, unable to change the CWD to ' + path,
RuntimeWarning, stacklevel=3) RuntimeWarning, stacklevel=3)
try: try:
yield os.getcwd() yield os.getcwd()
......
...@@ -95,6 +95,15 @@ class TestSupport(unittest.TestCase): ...@@ -95,6 +95,15 @@ class TestSupport(unittest.TestCase):
self.assertFalse(os.path.exists(TESTFN)) self.assertFalse(os.path.exists(TESTFN))
self.assertTrue(os.path.basename(os.getcwd()), here) self.assertTrue(os.path.basename(os.getcwd()), here)
def test_temp_cwd__chdir_warning(self):
"""Check the warning message when os.chdir() fails."""
path = TESTFN + '_does_not_exist'
with support.check_warnings() as recorder:
with support.temp_cwd(path=path, quiet=True):
pass
messages = [str(w.message) for w in recorder.warnings]
self.assertEqual(messages, ['tests may fail, unable to change the CWD to ' + path])
def test_sortdict(self): def test_sortdict(self):
self.assertEqual(support.sortdict({3:3, 2:2, 1:1}), "{1: 1, 2: 2, 3: 3}") self.assertEqual(support.sortdict({3:3, 2:2, 1:1}), "{1: 1, 2: 2, 3: 3}")
......
...@@ -84,6 +84,10 @@ Extension Modules ...@@ -84,6 +84,10 @@ Extension Modules
Tests Tests
----- -----
- Issue #15304: Fix warning message when os.chdir() fails inside
test.support.temp_cwd(). Patch by Chris Jerdonek.
- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch - Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
by Serhiy Storchaka. by Serhiy Storchaka.
......
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