run-tests: patch over py2.4 proc.wait() race stable
authorMatt Mackall <mpm@selenic.com>
Tue, 16 Jul 2013 12:44:11 -0500
branchstable
changeset 1280 952364b69450
parent 1279 9dac69d57f75
child 1281 3dc7d29a42e9
run-tests: patch over py2.4 proc.wait() race [ original upstream message ]
tests/run-tests.py
--- a/tests/run-tests.py	Mon Jul 01 20:48:56 2013 +0200
+++ b/tests/run-tests.py	Tue Jul 16 12:44:11 2013 -0500
@@ -838,7 +838,11 @@
         cleanup()
         raise
 
-    ret = proc.wait()
+    try:
+        ret = proc.wait()
+    except OSError:
+        # Py2.4 seems to have a race here
+        pass
     if wifexited(ret):
         ret = os.WEXITSTATUS(ret)