Update test_support for my temp_dir/change_cwd changes

2 files changed, 19 insertions, 6 deletions

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 58e4f92ead..d82ac88d77 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -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:
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index e83a4d6426..dd0c7bc232 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -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()