summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/test/support.py2
-rw-r--r--Lib/test/test_support.py9
-rw-r--r--Misc/NEWS4
3 files changed, 14 insertions, 1 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py
index 35ae76f..014bcf5 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -680,7 +680,7 @@ def temp_cwd(name='tempcwd', quiet=False, path=None):
except OSError:
if not quiet:
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)
try:
yield os.getcwd()
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 14fcdbf..f6ef5f6 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -95,6 +95,15 @@ class TestSupport(unittest.TestCase):
self.assertFalse(os.path.exists(TESTFN))
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):
self.assertEqual(support.sortdict({3:3, 2:2, 1:1}), "{1: 1, 2: 2, 3: 3}")
diff --git a/Misc/NEWS b/Misc/NEWS
index 04580d7..5d6ca0f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,6 +84,10 @@ Extension Modules
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
by Serhiy Storchaka.