gh-155433: Fix TaskGroup losing outside cancellation after cancel() by deadlovelll · Pull Request #155439 · python/cpython · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Lib/asyncio/taskgroups.py
21 changes: 21 additions & 0 deletions Lib/test/test_asyncio/test_taskgroups.py
Original file line number Diff line number Diff line change
Expand Up @@ -1154,6 +1154,27 @@ async def test_taskgroup_cancel_before_create_task(self):
with self.assertRaises(RuntimeError):
tg.create_task(asyncio.sleep(1))

async def test_taskgroup_cancel_keeps_outer_cancellation(self):
# gh-155433: any cancellation from outside the group must propagate.
async def child():
try:
await asyncio.sleep(10)
finally:
await asyncio.sleep(0.1)

async def body():
async with asyncio.TaskGroup() as tg:
tg.create_task(child())
await asyncio.sleep(0)
tg.cancel()

task = asyncio.create_task(body())
await asyncio.sleep(0.01)
task.cancel('message')
with self.assertRaises(asyncio.CancelledError) as cm:
await task
Comment thread
kumaraditya303 marked this conversation as resolved.
self.assertEqual('message', cm.exception.args[0])

async def test_taskgroup_cancel_before_exception(self):
async def raise_exc(parent_tg: asyncio.TaskGroup):
parent_tg.cancel()
Expand Down
Loading