[Python-checkins] cpython (merge 3.2 -> default): #15304: merge with 3.2.

Fri Sep 21 15:53:32 CEST 2012

http://hg.python.org/cpython/rev/b1d6daface10
changeset: 79087:b1d6daface10
parent: 79085:1830426da082
parent: 79086:0b60dcabf7e6
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Fri Sep 21 16:53:07 2012 +0300
summary:
 #15304: merge with 3.2.
files:
 Lib/test/support.py | 2 +-
 Lib/test/test_support.py | 9 +++++++++
 Misc/NEWS | 4 ++++
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -680,7 +680,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 --git a/Lib/test/test_support.py b/Lib/test/test_support.py
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -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 --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,6 +84,10 @@
 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.
 
-- 
Repository URL: http://hg.python.org/cpython
