[Python-checkins] r81584 - python/trunk/Lib/test/test_os.py

[brian.curtin]

Author: brian.curtin
Date: Fri May 28 17:49:21 2010
New Revision: 81584

Log:
Fix #8405 for slow buildbots. Remove the sleep on startup and move the
pipe communication into a loop to retry in case a buildbot gets even slower.


Modified:
   python/trunk/Lib/test/test_os.py

Modified: python/trunk/Lib/test/test_os.py
==============================================================================
--- python/trunk/Lib/test/test_os.py	(original)
+++ python/trunk/Lib/test/test_os.py	Fri May 28 17:49:21 2010
@@ -706,17 +706,22 @@
                                 stderr=subprocess.PIPE,
                                 stdin=subprocess.PIPE)
 
-        # Let the process start up (See #3137)
-        time.sleep(0.5)
-
-        # Create a string buffer to store the result of stdout from the pipe
-        buf = ctypes.create_string_buffer(len(msg))
-        # Obtain the text currently in proc.stdout
-        # Bytes read/avail/left are left as NULL and unused
-        rslt = PeekNamedPipe(msvcrt.get_osfhandle(proc.stdout.fileno()), buf,
-                             ctypes.sizeof(buf), None, None, None)
-        self.assertNotEqual(rslt, 0, "PeekNamedPipe failed")
-        self.assertEqual(msg, buf.value)
+        count, max = 0, 100
+        while count < max and proc.poll() is None:
+            # Create a string buffer to store the result of stdout from the pipe
+            buf = ctypes.create_string_buffer(len(msg))
+            # Obtain the text currently in proc.stdout
+            # Bytes read/avail/left are left as NULL and unused
+            rslt = PeekNamedPipe(msvcrt.get_osfhandle(proc.stdout.fileno()),
+                                 buf, ctypes.sizeof(buf), None, None, None)
+            self.assertNotEqual(rslt, 0, "PeekNamedPipe failed")
+            if buf.value:
+                self.assertEqual(msg, buf.value)
+                break
+            time.sleep(0.1)
+            count += 1
+        else:
+            self.fail("Did not receive communication from the subprocess")
 
         os.kill(proc.pid, sig)
         self.assertEqual(proc.wait(), sig)