mirror of
https://github.com/python/cpython.git
synced 2025-07-24 03:35:53 +00:00
Taskgroup tweaks (GH-31559)
Now uses .cancel()/.uncancel(), for even fewer broken edge cases.
This commit is contained in:
parent
41ddcd3f40
commit
edbee56d69
2 changed files with 41 additions and 33 deletions
|
@ -120,7 +120,11 @@ class TestTaskGroup(unittest.IsolatedAsyncioTestCase):
|
|||
self.assertTrue(t2_cancel)
|
||||
self.assertTrue(t2.cancelled())
|
||||
|
||||
async def test_taskgroup_05(self):
|
||||
async def test_cancel_children_on_child_error(self):
|
||||
"""
|
||||
When a child task raises an error, the rest of the children
|
||||
are cancelled and the errors are gathered into an EG.
|
||||
"""
|
||||
|
||||
NUM = 0
|
||||
t2_cancel = False
|
||||
|
@ -165,7 +169,7 @@ class TestTaskGroup(unittest.IsolatedAsyncioTestCase):
|
|||
self.assertTrue(t2_cancel)
|
||||
self.assertTrue(runner_cancel)
|
||||
|
||||
async def test_taskgroup_06(self):
|
||||
async def test_cancellation(self):
|
||||
|
||||
NUM = 0
|
||||
|
||||
|
@ -186,10 +190,12 @@ class TestTaskGroup(unittest.IsolatedAsyncioTestCase):
|
|||
await asyncio.sleep(0.1)
|
||||
|
||||
self.assertFalse(r.done())
|
||||
r.cancel()
|
||||
with self.assertRaises(asyncio.CancelledError):
|
||||
r.cancel("test")
|
||||
with self.assertRaises(asyncio.CancelledError) as cm:
|
||||
await r
|
||||
|
||||
self.assertEqual(cm.exception.args, ('test',))
|
||||
|
||||
self.assertEqual(NUM, 5)
|
||||
|
||||
async def test_taskgroup_07(self):
|
||||
|
@ -226,7 +232,7 @@ class TestTaskGroup(unittest.IsolatedAsyncioTestCase):
|
|||
|
||||
self.assertEqual(NUM, 15)
|
||||
|
||||
async def test_taskgroup_08(self):
|
||||
async def test_cancellation_in_body(self):
|
||||
|
||||
async def foo():
|
||||
await asyncio.sleep(0.1)
|
||||
|
@ -246,10 +252,12 @@ class TestTaskGroup(unittest.IsolatedAsyncioTestCase):
|
|||
await asyncio.sleep(0.1)
|
||||
|
||||
self.assertFalse(r.done())
|
||||
r.cancel()
|
||||
with self.assertRaises(asyncio.CancelledError):
|
||||
r.cancel("test")
|
||||
with self.assertRaises(asyncio.CancelledError) as cm:
|
||||
await r
|
||||
|
||||
self.assertEqual(cm.exception.args, ('test',))
|
||||
|
||||
async def test_taskgroup_09(self):
|
||||
|
||||
t1 = t2 = None
|
||||
|
@ -699,3 +707,7 @@ class TestTaskGroup(unittest.IsolatedAsyncioTestCase):
|
|||
async with taskgroups.TaskGroup() as g:
|
||||
t = g.create_task(coro(), name="yolo")
|
||||
self.assertEqual(t.get_name(), "yolo")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue