summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-05-17 22:16:14 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-05-17 22:16:14 (GMT)
commit3349bca46d66f993e97407ba756e3f515a863fad (patch)
treecda2f4acd5a813e81453d35a732167197611edfd
parent5ee0567bb2af1c81da72990c9b2cd199af2e2ace (diff)
downloadcpython-3349bca46d66f993e97407ba756e3f515a863fad.zip
cpython-3349bca46d66f993e97407ba756e3f515a863fad.tar.gz
cpython-3349bca46d66f993e97407ba756e3f515a863fad.tar.bz2
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.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py
index ff30d41..f0a2411 100644
--- a/Lib/test/lock_tests.py
+++ b/Lib/test/lock_tests.py
@@ -472,7 +472,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
diff --git a/Misc/NEWS b/Misc/NEWS
index c40136c..eae2952 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -75,6 +75,9 @@ Tools/Demos
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.