From e418d760897cc6f6f4dedb364f80f3f52525ffa6 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 21 Sep 2012 16:48:12 +0300
Subject: [PATCH] #15304: fix wrong warning message in test.support.temp_cwd().

---
 Lib/test/support.py | 2 +-
 Misc/NEWS           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Lib/test/support.py b/Lib/test/support.py
index d88562e907d..e1ec9e2d1f7 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -600,7 +600,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/Misc/NEWS b/Misc/NEWS
index c7e18277fbd..bebab93611d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -494,6 +494,9 @@ 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.