[Python-checkins] cpython (merge 3.3 -> default): Issue #17046: merge from 3.3

[ned.deily]

http://hg.python.org/cpython/rev/e3e28ee5b5c3
changeset:   84981:e3e28ee5b5c3
parent:      84979:314a872f54e1
parent:      84980:f37b336bfbca
user:        Ned Deily <nad at acm.org>
date:        Fri Aug 02 18:05:31 2013 -0700
summary:
  Issue #17046: merge from 3.3

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


diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -416,7 +416,8 @@
     def test_executable_without_cwd(self):
         # For a normal installation, it should work without 'cwd'
         # argument.  For test runs in the build directory, see #7774.
-        self._assert_cwd('', "somethingyoudonthave", executable=sys.executable)
+        self._assert_cwd(os.getcwd(), "somethingyoudonthave",
+                         executable=sys.executable)
 
     def test_stdin_pipe(self):
         # stdin redirection
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -599,6 +599,8 @@
 Tests
 -----
 
+- Issue #17046: Fix broken test_executable_without_cwd in test_subprocess.
+
 - Issue #15415: Add new temp_dir() and change_cwd() context managers to
   test.support, and refactor temp_cwd() to use them.  Patch by Chris Jerdonek.
 

-- 
Repository URL: http://hg.python.org/cpython