Merged revisions 84909-84913 via svnmerge from

pitrou · pitrou · commit 4a5dd5c57679 · 2010-09-20T11:17:39.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84909 | antoine.pitrou | 2010-09-20 00:46:05 +0200 (lun., 20 sept. 2010) | 3 lines Try to fix test_subprocess on "x86 debian parallel 3.x" buildbot ........ r84910 | antoine.pitrou | 2010-09-20 01:06:53 +0200 (lun., 20 sept. 2010) | 3 lines Try to make signal-sending tests in test_subprocess more robust on slow machines ........ r84911 | antoine.pitrou | 2010-09-20 01:28:30 +0200 (lun., 20 sept. 2010) | 3 lines Make error more explicit in test_finalize_with_trace ........ r84912 | antoine.pitrou | 2010-09-20 02:12:19 +0200 (lun., 20 sept. 2010) | 3 lines Try to fix buildbot failure (#9902) ........ r84913 | antoine.pitrou | 2010-09-20 03:33:21 +0200 (lun., 20 sept. 2010) | 3 lines Try a more robust implementation of _kill_process ........
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
@@ -765,12 +765,16 @@ def DISABLED_test_terminate(self):
 
         def test_undecodable_env(self):
             for key, value in (('test', 'abc\uDCFF'), ('test\uDCFF', '42')):
-                value_repr = repr(value).encode("ascii")
+                value_repr = ascii(value).encode("ascii")
 
                 # test str with surrogates
-                script = "import os; print(repr(os.getenv(%s)))" % repr(key)
+                script = "import os; print(ascii(os.getenv(%s)))" % repr(key)
                 env = os.environ.copy()
                 env[key] = value
+                # Force surrogate-escaping of \xFF in the child process;
+                # otherwise it can be decoded as-is if the default locale
+                # is latin-1.
+                env['PYTHONFSENCODING'] = 'ascii'
                 stdout = subprocess.check_output(
                     [sys.executable, "-c", script],
                     env=env)
@@ -780,7 +784,7 @@ def test_undecodable_env(self):
                 # test bytes
                 key = key.encode("ascii", "surrogateescape")
                 value = value.encode("ascii", "surrogateescape")
-                script = "import os; print(repr(os.getenv(%s)))" % repr(key)
+                script = "import os; print(ascii(os.getenv(%s)))" % repr(key)
                 env = os.environ.copy()
                 env[key] = value
                 stdout = subprocess.check_output(
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
@@ -279,7 +279,7 @@ def test_finalize_with_trace(self):
         # Issue1733757
         # Avoid a deadlock when sys.settrace steps into threading._shutdown
         import subprocess
-        rc = subprocess.call([sys.executable, "-c", """if 1:
+        p = subprocess.Popen([sys.executable, "-c", """if 1:
             import sys, threading
 
             # A deadlock-killer, to prevent the
@@ -299,9 +299,14 @@ def func(frame, event, arg):
                 return func
 
             sys.settrace(func)
-            """])
+            """],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE)
+        stdout, stderr = p.communicate()
+        rc = p.returncode
         self.assertFalse(rc == 2, "interpreted was blocked")
-        self.assertTrue(rc == 0, "Unexpected error")
+        self.assertTrue(rc == 0,
+                        "Unexpected error: " + ascii(stderr))
 
     def test_join_nondaemon_on_shutdown(self):
         # Issue 1722344
