From: Peter Astrand <astrand@lysator.liu.se>
Date: Fri, 12 Nov 2004 15:51:48 +0000 (+0000)
Subject: Use os.chdir/os.getcwd instead of os.path.realpath, to support Tru64
X-Git-Tag: v2.4c1~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=195404ff900cc7bb72517c4dbdda5b203b4c8b3c;p=thirdparty%2FPython%2Fcpython.git

Use os.chdir/os.getcwd instead of os.path.realpath, to support Tru64
TEMP dirs with {memb} strings. Fixes #1063571.
---

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index a5d9d9c59f33..b0d82356bca5 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -208,7 +208,12 @@ class ProcessTestCase(unittest.TestCase):
 
     def test_cwd(self):
         tmpdir = os.getenv("TEMP", "/tmp")
-        tmpdir = os.path.realpath(tmpdir)
+        # We cannot use os.path.realpath to canonicalize the path,
+        # since it doesn't expand Tru64 {memb} strings. See bug 1063571.
+        cwd = os.getcwd()
+        os.chdir(tmpdir)
+        tmpdir = os.getcwd()
+        os.chdir(cwd)
         p = subprocess.Popen([sys.executable, "-c",
                           'import sys,os;' \
                           'sys.stdout.write(os.getcwd())'],