merge 3.2

2012-04-23 10:08:20 -04:00 · 2012-04-23 10:08:20 -04:00 · 1cf5aa9106
parent 938d44d59c 7a436c5a53
commit 1cf5aa9106
1 changed files with 1 additions and 1 deletions
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@ -148,7 +148,7 @@ class ThreadRunningTests(BasicThreadTest):
            thread.start_new_thread(task, ())
            started.acquire()
            while thread._count() > c:
-                pass
+                time.sleep(0.01)
        self.assertIn("Traceback", stderr.getvalue())