diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-18 00:20:18 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-18 00:20:18 +0200 |
| commit | 5f3b1c4979fc03624b2f54ef8b156dd652b85c5c (patch) | |
| tree | 1448785efe111d8d85031634187033cd41a65000 | |
| parent | 1cb08c3f838524827cb054f016849a28aa49549c (diff) | |
| parent | 3349bca46d66f993e97407ba756e3f515a863fad (diff) | |
| download | cpython-git-5f3b1c4979fc03624b2f54ef8b156dd652b85c5c.tar.gz | |
(Merge 3.2) Issue #12096: Fix a race condition in
test_threading.test_waitfor(). Patch written by Charles-François Natali.
| -rw-r--r-- | Lib/test/lock_tests.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py index 3ed61f3b93..126f97cb31 100644 --- a/Lib/test/lock_tests.py +++ b/Lib/test/lock_tests.py @@ -474,7 +474,7 @@ class ConditionTests(BaseTestCase): self.assertEqual(state, 4) b = Bunch(f, 1) b.wait_for_started() - for i in range(5): + for i in range(4): time.sleep(0.01) with cond: state += 1 @@ -679,6 +679,9 @@ Extension Modules Tests ----- +- Issue #12096: Fix a race condition in test_threading.test_waitfor(). Patch + written by Charles-François Natali. + - Issue #11614: import __hello__ prints "Hello World!". Patch written by Andreas Stührk. |