Merge branch 'main' into patch-4

python · Dreamsorcerer · Sep 3, 2021 · Sep 3, 2021 · Sep 3, 2021 · Sep 3, 2021
commit 80f027b5a604c216fb180feb7020b9acfdf99183
@@ -1010,15 +1010,16 @@ def gen():
 
     def test_wait_for_cancellation_race_condition(self):
         async def inner():
-            await asyncio.wait_for(asyncio.sleep(1), timeout=2)
+            with contextlib.suppress(asyncio.CancelledError):
+                await asyncio.sleep(1)
             return 1
 
         async def main():
-            result = await asyncio.wait_for(inner(), timeout=1)
+            result = await asyncio.wait_for(inner(), timeout=.01)
             assert result == 1
 
         asyncio.run(main())
-        
+
     def test_wait_for_does_not_suppress_cancellation(self):
         async def inner():
                return
@@ -1034,7 +1035,7 @@ async def main():
             task.cancel()
             with self.assertRaises(asyncio.CancelledError):
                 await task
-                
+
         asyncio.run(main())
 
     def test_wait_for_waits_for_task_cancellation(self):