[Python-checkins] r84924 - in python/branches/release27-maint: Lib/test/test_subprocess.py Lib/test/test_threading.py

Mon Sep 20 13:20:44 CEST 2010

Author: antoine.pitrou
Date: Mon Sep 20 13:20:44 2010
New Revision: 84924
Log:
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
........
Modified:
 python/branches/release27-maint/ (props changed)
 python/branches/release27-maint/Lib/test/test_subprocess.py
 python/branches/release27-maint/Lib/test/test_threading.py
Modified: python/branches/release27-maint/Lib/test/test_subprocess.py
==============================================================================

--- python/branches/release27-maint/Lib/test/test_subprocess.py	(original)
+++ python/branches/release27-maint/Lib/test/test_subprocess.py	Mon Sep 20 13:20:44 2010
@@ -717,24 +717,20 @@
 def _kill_process(self, method, *args):
 # Do not inherit file handles from the parent.
 # It should fix failures on some platforms.
- p = subprocess.Popen([sys.executable, "-c", "input()"], close_fds=True,
- stdin=subprocess.PIPE, stderr=subprocess.PIPE)
-
- # Let the process initialize (Issue #3137)
- time.sleep(0.1)
- # The process should not terminate prematurely
- self.assertIsNone(p.poll())
- # Retry if the process do not receive the signal.
- count, maxcount = 0, 3
- while count < maxcount and p.poll() is None:
- getattr(p, method)(*args)
- time.sleep(0.1)
- count += 1
-
- self.assertIsNotNone(p.poll(), "the subprocess did not terminate")
- if count > 1:
- print >>sys.stderr, ("p.{}{} succeeded after "
- "{} attempts".format(method, args, count))
+ p = subprocess.Popen([sys.executable, "-c", """if 1:
+ import sys, time
+ sys.stdout.write('x\\n')
+ sys.stdout.flush()
+ time.sleep(30)
+ """],
+ close_fds=True,
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ # Wait for the interpreter to be completely initialized before
+ # sending any signal.
+ p.stdout.read(1)
+ getattr(p, method)(*args)
 return p
 
 def test_send_signal(self):
Modified: python/branches/release27-maint/Lib/test/test_threading.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_threading.py	(original)
+++ python/branches/release27-maint/Lib/test/test_threading.py	Mon Sep 20 13:20:44 2010
@@ -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
