diff options
| -rw-r--r-- | Lib/asyncio/locks.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_locks.py | 31 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-02-14-00-21-24.bpo-32841.bvHDOc.rst | 2 |
3 files changed, 34 insertions, 5 deletions
diff --git a/Lib/asyncio/locks.py b/Lib/asyncio/locks.py index 508a214..91f7a01 100644 --- a/Lib/asyncio/locks.py +++ b/Lib/asyncio/locks.py @@ -358,12 +358,16 @@ class Condition(_ContextManagerMixin): finally: # Must reacquire lock even if wait is cancelled + cancelled = False while True: try: await self.acquire() break except futures.CancelledError: - pass + cancelled = True + + if cancelled: + raise futures.CancelledError async def wait_for(self, predicate): """Wait until a predicate becomes true. diff --git a/Lib/test/test_asyncio/test_locks.py b/Lib/test/test_asyncio/test_locks.py index 3e3dd79..8642aa8 100644 --- a/Lib/test/test_asyncio/test_locks.py +++ b/Lib/test/test_asyncio/test_locks.py @@ -214,11 +214,11 @@ class LockTests(test_utils.TestCase): call_count += 1 await lock.acquire() lock_count += 1 - + async def lockandtrigger(): await lock.acquire() self.loop.call_soon(trigger) - + def trigger(): t1.cancel() lock.release() @@ -248,8 +248,6 @@ class LockTests(test_utils.TestCase): test_utils.run_briefly(self.loop) self.assertTrue(t3.cancelled()) - - def test_finished_waiter_cancelled(self): lock = asyncio.Lock(loop=self.loop) @@ -576,6 +574,31 @@ class ConditionTests(test_utils.TestCase): self.assertTrue(cond.locked()) + def test_wait_cancel_after_notify(self): + # See bpo-32841 + cond = asyncio.Condition(loop=self.loop) + waited = False + + async def wait_on_cond(): + nonlocal waited + async with cond: + waited = True # Make sure this area was reached + await cond.wait() + + waiter = asyncio.ensure_future(wait_on_cond(), loop=self.loop) + test_utils.run_briefly(self.loop) # Start waiting + + self.loop.run_until_complete(cond.acquire()) + cond.notify() + test_utils.run_briefly(self.loop) # Get to acquire() + waiter.cancel() + test_utils.run_briefly(self.loop) # Activate cancellation + cond.release() + test_utils.run_briefly(self.loop) # Cancellation should occur + + self.assertTrue(waiter.cancelled()) + self.assertTrue(waited) + def test_wait_unacquired(self): cond = asyncio.Condition(loop=self.loop) self.assertRaises( diff --git a/Misc/NEWS.d/next/Library/2018-02-14-00-21-24.bpo-32841.bvHDOc.rst b/Misc/NEWS.d/next/Library/2018-02-14-00-21-24.bpo-32841.bvHDOc.rst new file mode 100644 index 0000000..a6d4566 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-02-14-00-21-24.bpo-32841.bvHDOc.rst @@ -0,0 +1,2 @@ +Fixed `asyncio.Condition` issue which silently ignored cancellation after +notifying and cancelling a conditional lock. Patch by Bar Harel. |