Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit16b46eb

Browse files
authored
gh-119121: Fix and testasync.staggered.staggered_race (#119173)
1 parent357f5a1 commit16b46eb

File tree

3 files changed

+100
-2
lines changed

3 files changed

+100
-2
lines changed

‎Lib/asyncio/staggered.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ async def staggered_race(coro_fns, delay, *, loop=None):
6969
exceptions= []
7070
running_tasks= []
7171

72-
asyncdefrun_one_coro(
73-
previous_failed:typing.Optional[locks.Event])->None:
72+
asyncdefrun_one_coro(previous_failed)->None:
7473
# Wait for the previous task to finish, or for delay seconds
7574
ifprevious_failedisnotNone:
7675
withcontextlib.suppress(exceptions_mod.TimeoutError):
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
importasyncio
2+
importunittest
3+
fromasyncio.staggeredimportstaggered_race
4+
5+
fromtestimportsupport
6+
7+
support.requires_working_socket(module=True)
8+
9+
10+
deftearDownModule():
11+
asyncio.set_event_loop_policy(None)
12+
13+
14+
classStaggeredTests(unittest.IsolatedAsyncioTestCase):
15+
asyncdeftest_empty(self):
16+
winner,index,excs=awaitstaggered_race(
17+
[],
18+
delay=None,
19+
)
20+
21+
self.assertIs(winner,None)
22+
self.assertIs(index,None)
23+
self.assertEqual(excs, [])
24+
25+
asyncdeftest_one_successful(self):
26+
asyncdefcoro(index):
27+
returnf'Res:{index}'
28+
29+
winner,index,excs=awaitstaggered_race(
30+
[
31+
lambda:coro(0),
32+
lambda:coro(1),
33+
],
34+
delay=None,
35+
)
36+
37+
self.assertEqual(winner,'Res: 0')
38+
self.assertEqual(index,0)
39+
self.assertEqual(excs, [None])
40+
41+
asyncdeftest_first_error_second_successful(self):
42+
asyncdefcoro(index):
43+
ifindex==0:
44+
raiseValueError(index)
45+
returnf'Res:{index}'
46+
47+
winner,index,excs=awaitstaggered_race(
48+
[
49+
lambda:coro(0),
50+
lambda:coro(1),
51+
],
52+
delay=None,
53+
)
54+
55+
self.assertEqual(winner,'Res: 1')
56+
self.assertEqual(index,1)
57+
self.assertEqual(len(excs),2)
58+
self.assertIsInstance(excs[0],ValueError)
59+
self.assertIs(excs[1],None)
60+
61+
asyncdeftest_first_timeout_second_successful(self):
62+
asyncdefcoro(index):
63+
ifindex==0:
64+
awaitasyncio.sleep(10)# much bigger than delay
65+
returnf'Res:{index}'
66+
67+
winner,index,excs=awaitstaggered_race(
68+
[
69+
lambda:coro(0),
70+
lambda:coro(1),
71+
],
72+
delay=0.1,
73+
)
74+
75+
self.assertEqual(winner,'Res: 1')
76+
self.assertEqual(index,1)
77+
self.assertEqual(len(excs),2)
78+
self.assertIsInstance(excs[0],asyncio.CancelledError)
79+
self.assertIs(excs[1],None)
80+
81+
asyncdeftest_none_successful(self):
82+
asyncdefcoro(index):
83+
raiseValueError(index)
84+
85+
winner,index,excs=awaitstaggered_race(
86+
[
87+
lambda:coro(0),
88+
lambda:coro(1),
89+
],
90+
delay=None,
91+
)
92+
93+
self.assertIs(winner,None)
94+
self.assertIs(index,None)
95+
self.assertEqual(len(excs),2)
96+
self.assertIsInstance(excs[0],ValueError)
97+
self.assertIsInstance(excs[1],ValueError)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix a NameError happening in ``asyncio.staggered.staggered_race``. This
2+
function is now tested.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp