Issue #17046: merge from 3.3

2013-08-02 18:05:31 -07:00 · 2013-08-02 18:05:31 -07:00 · 582583bc41
parent 95db2e7b8a e92dfbfec8
commit 582583bc41
2 changed files with 4 additions and 1 deletions
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@ -416,7 +416,8 @@ class ProcessTestCase(BaseTestCase):
    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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -599,6 +599,8 @@ Library
 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.