Skip to content

gh-95051: ensure that timeouts scheduled with asyncio.Timeout that have already expired are deliverered promptly #95109

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 9 commits into from
Jul 24, 2022
Merged

gh-95051: ensure that timeouts scheduled with asyncio.Timeout that have already expired are deliverered promptly #95109

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dce6d74
gh-95051: handle timeouts.timeout(0) and timeouts.timeout(-1)
graingert Jul 20, 2022
51686d7
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 21, 2022
418a81f
Update Lib/asyncio/timeouts.py
graingert Jul 21, 2022
174a3ff
Update Misc/NEWS.d/next/Library/2022-07-21-22-59-22.gh-issue-95109.us…
graingert Jul 21, 2022
a42e1e1
Update Lib/test/test_asyncio/test_timeouts.py
graingert Jul 21, 2022
de2f046
Merge branch 'main' into asyncio-timeout-0-0
graingert Jul 22, 2022
495cd2b
Update Misc/NEWS.d/next/Library/2022-07-21-22-59-22.gh-issue-95109.us…
graingert Jul 22, 2022
6b01baa
Update Lib/asyncio/timeouts.py
graingert Jul 22, 2022
b7fe485
document asyncio.timeout(-1)
graingert Jul 23, 2022
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
8 changes: 4 additions & 4 deletions Lib/asyncio/timeouts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ def reschedule(self, when: Optional[float]) -> None:
self._timeout_handler = None
else:
loop = events.get_running_loop()
self._timeout_handler = loop.call_at(
when,
self._on_timeout,
)
if loop.time() >= when:
Comment thread
graingert marked this conversation as resolved.
Resolved
self._timeout_handler = loop.call_soon(self._on_timeout)
else:
self._timeout_handler = loop.call_at(when, self._on_timeout)

def expired(self) -> bool:
"""Is timeout expired during execution?"""
Expand Down
24 changes: 24 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 @@ -105,6 +105,30 @@ async def test_timeout_zero(self):
self.assertLess(t1-t0, 2)
self.assertTrue(t0 <= cm.when() <= t1)

async def test_timeout_zero_sleep_zero(self):
loop = asyncio.get_running_loop()
t0 = loop.time()
with self.assertRaises(TimeoutError):
async with asyncio.timeout(0) as cm:
await asyncio.sleep(0)
t1 = loop.time()
self.assertTrue(cm.expired())
# 2 sec for slow CI boxes
self.assertLess(t1-t0, 2)
self.assertTrue(t0 <= cm.when() <= t1)

async def test_timeout_in_the_past_sleep_zero(self):
loop = asyncio.get_running_loop()
t0 = loop.time()
with self.assertRaises(TimeoutError):
async with asyncio.timeout(-11) as cm:
await asyncio.sleep(0)
t1 = loop.time()
self.assertTrue(cm.expired())
# 2 sec for slow CI boxes
self.assertLess(t1-t0, 2)
self.assertTrue(t0 <= cm.when() <= t1)
Comment thread
graingert marked this conversation as resolved.
Resolved

async def test_foreign_exception_passed(self):
with self.assertRaises(KeyError):
async with asyncio.timeout(0.01) as cm:
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2022-07-21-22-59-22.gh-issue-95109.usxA9r.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
special case asyncio.timeout(0) and timeouts in the past
Comment thread
graingert marked this conversation as resolved.
Resolved