diff options
| author | Elvis Pranskevichus <elvis@magic.io> | 2020-08-26 20:59:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-26 20:59:17 (GMT) |
| commit | 57b698886b47bb81c782c2ba80a8a72fe66c7aad (patch) | |
| tree | 2e4138f42e267b3dcbba13e16effb31c2d4eb3b3 | |
| parent | 6e1954cd8286e083e7f8d09516d91b6b15769a4e (diff) | |
| download | cpython-57b698886b47bb81c782c2ba80a8a72fe66c7aad.zip cpython-57b698886b47bb81c782c2ba80a8a72fe66c7aad.tar.gz cpython-57b698886b47bb81c782c2ba80a8a72fe66c7aad.tar.bz2 | |
[3.8] bpo-32751: Wait for task cancel in asyncio.wait_for() when timeout <= 0 (GH-21895) (#21967)
When I was fixing bpo-32751 back in GH-7216 I missed the case when
*timeout* is zero or negative. This takes care of that.
Props to @aaliddell for noticing the inconsistency..
(cherry picked from commit c517fc712105c8e5930cb42baaebdbe37fc3e15f)
| -rw-r--r-- | Lib/asyncio/tasks.py | 9 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_tasks.py | 31 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-08-15-15-50-12.bpo-32751.85je5X.rst | 3 |
3 files changed, 41 insertions, 2 deletions
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index 373be37..9ca9fa0 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -460,8 +460,13 @@ async def wait_for(fut, timeout, *, loop=None): if fut.done(): return fut.result() - fut.cancel() - raise exceptions.TimeoutError() + await _cancel_and_wait(fut, loop=loop) + try: + fut.result() + except exceptions.CancelledError as exc: + raise exceptions.TimeoutError() from exc + else: + raise exceptions.TimeoutError() waiter = loop.create_future() timeout_handle = loop.call_later(timeout, _release_waiter, waiter) diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py index a70dc0a..c402f8f 100644 --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -888,6 +888,9 @@ class BaseTaskTests: nonlocal task_done try: await asyncio.sleep(0.2) + except asyncio.CancelledError: + await asyncio.sleep(0.1) + raise finally: task_done = True @@ -900,6 +903,34 @@ class BaseTaskTests: loop.run_until_complete(foo()) + def test_wait_for_waits_for_task_cancellation_w_timeout_0(self): + loop = asyncio.new_event_loop() + self.addCleanup(loop.close) + + task_done = False + + async def foo(): + async def inner(): + nonlocal task_done + try: + await asyncio.sleep(10) + except asyncio.CancelledError: + await asyncio.sleep(0.1) + raise + finally: + task_done = True + + inner_task = self.new_task(loop, inner()) + await asyncio.sleep(0.1) + await asyncio.wait_for(inner_task, timeout=0) + + with self.assertRaises(asyncio.TimeoutError) as cm: + loop.run_until_complete(foo()) + + self.assertTrue(task_done) + chained = cm.exception.__context__ + self.assertEqual(type(chained), asyncio.CancelledError) + def test_wait_for_self_cancellation(self): loop = asyncio.new_event_loop() self.addCleanup(loop.close) diff --git a/Misc/NEWS.d/next/Library/2020-08-15-15-50-12.bpo-32751.85je5X.rst b/Misc/NEWS.d/next/Library/2020-08-15-15-50-12.bpo-32751.85je5X.rst new file mode 100644 index 0000000..c172ce5 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-08-15-15-50-12.bpo-32751.85je5X.rst @@ -0,0 +1,3 @@ +When cancelling the task due to a timeout, :meth:`asyncio.wait_for` will now +wait until the cancellation is complete also in the case when *timeout* is +<= 0, like it does with positive timeouts. |