Merged revisions 84909-84913 via svnmerge from
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_threading.py b/Lib/test/test_threading.py
index 2e2558a..d97b062 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -307,7 +307,7 @@
# 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
@@ -327,9 +327,14 @@
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: " + repr(stderr))
def test_join_nondaemon_on_shutdown(self):
# Issue 1722344