summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2013-08-03 01:05:31 (GMT)
committerNed Deily <nad@acm.org>2013-08-03 01:05:31 (GMT)
commit582583bc41523e13a295da9b8ea4dfe784b5071e (patch)
tree8f24bb3408bfaea9020fb2f0822ed2f4fb9c0b01
parent95db2e7b8a0477ddf60902ca0aacdafbb265e5a5 (diff)
parente92dfbfec8db930c5960492c3d9470f3415e27a3 (diff)
downloadcpython-582583bc41523e13a295da9b8ea4dfe784b5071e.zip
cpython-582583bc41523e13a295da9b8ea4dfe784b5071e.tar.gz
cpython-582583bc41523e13a295da9b8ea4dfe784b5071e.tar.bz2
Issue #17046: merge from 3.3
-rw-r--r--Lib/test/test_subprocess.py3
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 3bbb19c..470faff 100644
--- 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
diff --git a/Misc/NEWS b/Misc/NEWS
index 027f5a7..868fb9ee 100644
--- 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.