diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/lock_tests.py | 16 | ||||
| -rw-r--r-- | Lib/threading.py | 7 |
2 files changed, 20 insertions, 3 deletions
diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py index 12871c1..d88f364 100644 --- a/Lib/test/lock_tests.py +++ b/Lib/test/lock_tests.py @@ -353,6 +353,22 @@ class EventTests(BaseTestCase): for r, dt in results2: self.assertTrue(r) + def test_set_and_clear(self): + # Issue #13502: check that wait() returns true even when the event is + # cleared before the waiting thread is woken up. + evt = self.eventtype() + results = [] + N = 5 + def f(): + results.append(evt.wait(1)) + b = Bunch(f, N) + b.wait_for_started() + time.sleep(0.5) + evt.set() + evt.clear() + b.wait_for_finished() + self.assertEqual(results, [True] * N) + class ConditionTests(BaseTestCase): """ diff --git a/Lib/threading.py b/Lib/threading.py index 2362be6..e85e269 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -408,9 +408,10 @@ class Event(_Verbose): def wait(self, timeout=None): self._cond.acquire() try: - if not self._flag: - self._cond.wait(timeout) - return self._flag + signaled = self._flag + if not signaled: + signaled = self._cond.wait(timeout) + return signaled finally: self._cond.release() |