diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-04-23 14:08:20 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-04-23 14:08:20 (GMT) |
| commit | 1cf5aa910649bd831cad8f87963277025deb0695 (patch) | |
| tree | 228457964e8874542d5816187bd667635aabc77b | |
| parent | 938d44d59c9cc142d35f51a908cabf781b482f26 (diff) | |
| parent | 7a436c5a5338a022ff111f3c9bcc075716e14b68 (diff) | |
| download | cpython-1cf5aa910649bd831cad8f87963277025deb0695.zip cpython-1cf5aa910649bd831cad8f87963277025deb0695.tar.gz cpython-1cf5aa910649bd831cad8f87963277025deb0695.tar.bz2 | |
merge 3.2
| -rw-r--r-- | Lib/test/test_thread.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index 41fb3ac..a191e15 100644 --- 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()) |