Skip to content

gh-102780: Fix uncancel() call in asyncio timeouts #102815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gvanrossum merged 13 commits into from
Mar 22, 2023
Merged

gh-102780: Fix uncancel() call in asyncio timeouts #102815

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9f96cea
document use of uncancel() when suppressing CancelledError
kristjanvalur Mar 18, 2023
07517b7
Create unittest
kristjanvalur Mar 18, 2023
1150db0
record previous cancel state in timeout context manager
kristjanvalur Mar 18, 2023
d207fb1
explicitly raise from cancelled error
kristjanvalur Mar 18, 2023
912f26d
Update Doc/library/asyncio-task.rst
kristjanvalur Mar 20, 2023
ee574fc
Clarify how code should "ignore" CancelledError
kristjanvalur Mar 20, 2023
c91dae7
Apply suggestions from code review
kristjanvalur Mar 20, 2023
902691e
Add unittest for asyncio.TimeoutError.__cause__
kristjanvalur Mar 20, 2023
0f7bde5
Merge branch 'main' into kristjan/uncancel
kristjanvalur Mar 20, 2023
07c40cc
add news
kristjanvalur Mar 22, 2023
2a8914e
Merge branch 'main' into kristjan/uncancel
kristjanvalur Mar 22, 2023
a6f3114
Rename news file
kristjanvalur Mar 22, 2023
6e299fa
fix news entry
kristjanvalur Mar 22, 2023
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
Prev Previous commit
Next Next commit
Create unittest
  • Loading branch information
@kristjanvalur
kristjanvalur committed Mar 18, 2023
commit 07517b7703ff4a692a48c9a9cf46c76c9b6df4a2
23 changes: 23 additions & 0 deletions Lib/test/test_asyncio/test_timeouts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,29 @@ async def test_nested_timeout_in_finally(self):
async with asyncio.timeout(0.01):
await asyncio.sleep(10)

async def test_timeout_after_cancellation(self):
try:
asyncio.current_task().cancel()
await asyncio.sleep(1) # work which will be cancelled
except asyncio.CancelledError:
pass
finally:
with self.assertRaises(TimeoutError):
async with asyncio.timeout(0.0):
await asyncio.sleep(1) # some cleanup

async def test_cancel_in_timeout_after_cancellation(self):
try:
asyncio.current_task().cancel()
await asyncio.sleep(1) # work which will be cancelled
except asyncio.CancelledError:
pass
finally:
with self.assertRaises(asyncio.CancelledError):
async with asyncio.timeout(1.0):
asyncio.current_task().cancel()
await asyncio.sleep(2) # some cleanup


if __name__ == '__main__':
unittest.main()