merge 3.2

30267cc6 · Benjamin Peterson · 6df68f65 · 5cf2e5c2 · 30267cc6
Commit 30267cc6 authored Apr 23, 2012 by Benjamin Peterson
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Lib/test/test_thread.py Lib/test/test_thread.py +1 -1

No files found.
--- 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())