diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-12 14:20:59 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-12 14:20:59 (GMT) |
| commit | 171ba0504aa778d81346ea56fc9000b29d4d3e1d (patch) | |
| tree | 587a3ad2f16e74fdb46bf08130662a887aac8e7b /Lib/test/test_sys.py | |
| parent | 4d1246b3aa9dca4339aeaded3406bf4e34f3585d (diff) | |
| download | cpython-171ba0504aa778d81346ea56fc9000b29d4d3e1d.zip cpython-171ba0504aa778d81346ea56fc9000b29d4d3e1d.tar.gz cpython-171ba0504aa778d81346ea56fc9000b29d4d3e1d.tar.bz2 | |
Merged revisions 78835-78837 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78835 | victor.stinner | 2010-03-11 13:34:39 +0100 (jeu., 11 mars 2010) | 7 lines
Issue #7774: Set sys.executable to an empty string if argv[0] has been
set to an non existent program name and Python is unable to retrieve the real
program name.
Fix also sysconfig: if sys.executable is an empty string, use the current
working directory.
........
r78836 | victor.stinner | 2010-03-11 14:27:35 +0100 (jeu., 11 mars 2010) | 4 lines
Fix test_executable introduce in previous commit (r78835): Windows is able to
retrieve the absolute Python path even if argv[0] has been set to a non
existent program name.
........
r78837 | victor.stinner | 2010-03-11 14:46:06 +0100 (jeu., 11 mars 2010) | 3 lines
Another fix to test_executable() of test_sys: set the current working to avoid
the #7774 bug.
........
Diffstat (limited to 'Lib/test/test_sys.py')
| -rw-r--r-- | Lib/test/test_sys.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index e20c95f..eb0bef8 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -479,6 +479,23 @@ class SysModuleTest(unittest.TestCase): out = p.communicate()[0].strip() self.assertEqual(out, b'?') + def test_executable(self): + # Issue #7774: Ensure that sys.executable is an empty string if argv[0] + # has been set to an non existent program name and Python is unable to + # retrieve the real program name + import subprocess + # For a normal installation, it should work without 'cwd' + # argument. For test runs in the build directory, see #7774. + python_dir = os.path.dirname(os.path.realpath(sys.executable)) + p = subprocess.Popen( + ["nonexistent", "-c", + 'import sys; print(sys.executable.encode("ascii", "backslashreplace"))'], + executable=sys.executable, stdout=subprocess.PIPE, cwd=python_dir) + stdout = p.communicate()[0] + executable = stdout.strip().decode("ASCII") + p.wait() + self.assertIn(executable, ["b''", repr(sys.executable.encode("ascii", "backslashreplace"))]) + class SizeofTest(unittest.TestCase): |