From edbee56d698ebb4489aa68311f44d104a23f5eb7 Mon Sep 17 00:00:00 2001 From: Tin Tvrtković Date: Sat, 26 Feb 2022 17:18:48 +0100 Subject: Taskgroup tweaks (GH-31559) Now uses .cancel()/.uncancel(), for even fewer broken edge cases. --- Lib/test/test_asyncio/test_taskgroups.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'Lib/test/test_asyncio/test_taskgroups.py') diff --git a/Lib/test/test_asyncio/test_taskgroups.py b/Lib/test/test_asyncio/test_taskgroups.py index 40774a8993e..df51528e107 100644 --- a/Lib/test/test_asyncio/test_taskgroups.py +++ b/Lib/test/test_asyncio/test_taskgroups.py @@ -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() -- cgit v1.2.3