From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 4 Apr 2011 19:59:09 +0000 (+0200)
Subject: Try to fix sporadic failure in test_thread/test_threading
X-Git-Tag: v3.2.1b1~176^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45fdb457da43da417796c465ebac3cec0beeb1bf;p=thirdparty%2FPython%2Fcpython.git

Try to fix sporadic failure in test_thread/test_threading
---

diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py
index 04f7422c8de7..22c690059297 100644
--- a/Lib/test/lock_tests.py
+++ b/Lib/test/lock_tests.py
@@ -141,7 +141,13 @@ class BaseLockTests(BaseTestCase):
         # We run many threads in the hope that existing threads ids won't
         # be recycled.
         Bunch(f, 15).wait_for_finished()
-        self.assertEqual(n, len(threading.enumerate()))
+        if len(threading.enumerate()) != n:
+            # There is a small window during which a Thread instance's
+            # target function has finished running, but the Thread is still
+            # alive and registered.  Avoid spurious failures by waiting a
+            # bit more (seen on a buildbot).
+            time.sleep(0.4)
+            self.assertEqual(n, len(threading.enumerate()))
 
 
 class LockTests(BaseLockTests):