diff -r 5d43154d68a8 Lib/test/support.py --- a/Lib/test/support.py Sun Jul 08 21:03:01 2012 +0200 +++ b/Lib/test/support.py Mon Jul 09 06:14:08 2012 -0700 @@ -615,7 +615,7 @@ 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 -r 5d43154d68a8 Lib/test/test_support.py --- a/Lib/test/test_support.py Sun Jul 08 21:03:01 2012 +0200 +++ b/Lib/test/test_support.py Mon Jul 09 06:14:08 2012 -0700 @@ -95,6 +95,15 @@ 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 -r 5d43154d68a8 Misc/ACKS --- a/Misc/ACKS Sun Jul 08 21:03:01 2012 +0200 +++ b/Misc/ACKS Mon Jul 09 06:14:08 2012 -0700 @@ -505,6 +505,7 @@ Drew Jenkins Flemming Kjær Jensen MunSic Jeong +Chris Jerdonek Jim Jewett Orjan Johansen Fredrik Johansson diff -r 5d43154d68a8 Misc/NEWS --- a/Misc/NEWS Sun Jul 08 21:03:01 2012 +0200 +++ b/Misc/NEWS Mon Jul 09 06:14:08 2012 -0700 @@ -104,6 +104,9 @@ - Issue #15284: Skip {send,recv}msg tests in test_socket when IPv6 is not enabled. Patch by Brian Brazil. +- Issue #15304: Fix warning message when os.chdir() fails inside + test.support.temp_cwd(). Patch by Chris Jerdonek. + - Issue #15277: Fix a resource leak in support.py when IPv6 is disabled. Patch by Brian Brazil.