mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-03 05:35:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-133419: fix test_external_inspection race assert (#133433)

Browse source 
Follow-up of commit c4cc5d58ae,
fix more tests.
This commit is contained in:
Victor Stinner 2025-05-05 14:38:51 +02:00 • committed by GitHub
parent b97328ef5d
commit 8d5f3cd2ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Lib/test/test_external_inspection.py
View file

@ -59,7 +59,7 @@ class TestGetStackTrace(unittest.TestCase):
foo() foo()
def foo(): def foo():
sock.sendall(b"ready"); time.sleep(1000) # same line number sock.sendall(b"ready"); time.sleep(10_000) # same line number
bar() bar()
""" """
@ -121,8 +121,7 @@ class TestGetStackTrace(unittest.TestCase):
sock.connect(('localhost', {port})) sock.connect(('localhost', {port}))
def c5(): def c5():
sock.sendall(b"ready") sock.sendall(b"ready"); time.sleep(10_000) # same line number
time.sleep(10000)
async def c4(): async def c4():
await asyncio.sleep(0) await asyncio.sleep(0)
@ -194,10 +193,10 @@ class TestGetStackTrace(unittest.TestCase):
root_task = "Task-1" root_task = "Task-1"
expected_stack_trace = [ expected_stack_trace = [
[ [
("c5", script_name, 11), ("c5", script_name, 10),
("c4", script_name, 15), ("c4", script_name, 14),
("c3", script_name, 18), ("c3", script_name, 17),
("c2", script_name, 21), ("c2", script_name, 20),
], ],
"c2_root", "c2_root",
[ [
@ -213,13 +212,13 @@ class TestGetStackTrace(unittest.TestCase):
taskgroups.__file__, taskgroups.__file__,
ANY, ANY,
), ),
("main", script_name, 27), ("main", script_name, 26),
], ],
"Task-1", "Task-1",
[], [],
], ],
[ [
[("c1", script_name, 24)], [("c1", script_name, 23)],
"sub_main_1", "sub_main_1",
[ [
[ [
@ -234,7 +233,7 @@ class TestGetStackTrace(unittest.TestCase):
taskgroups.__file__, taskgroups.__file__,
ANY, ANY,
), ),
("main", script_name, 27), ("main", script_name, 26),
], ],
"Task-1", "Task-1",
[], [],
@ -242,7 +241,7 @@ class TestGetStackTrace(unittest.TestCase):
], ],
], ],
[ [
[("c1", script_name, 24)], [("c1", script_name, 23)],
"sub_main_2", "sub_main_2",
[ [
[ [
@ -257,7 +256,7 @@ class TestGetStackTrace(unittest.TestCase):
taskgroups.__file__, taskgroups.__file__,
ANY, ANY,
), ),
("main", script_name, 27), ("main", script_name, 26),
], ],
"Task-1", "Task-1",
[], [],
@ -287,8 +286,7 @@ class TestGetStackTrace(unittest.TestCase):
sock.connect(('localhost', {port})) sock.connect(('localhost', {port}))
async def gen_nested_call(): async def gen_nested_call():
sock.sendall(b"ready") sock.sendall(b"ready"); time.sleep(10_000) # same line number
time.sleep(10000)
async def gen(): async def gen():
for num in range(2): for num in range(2):
@ -336,9 +334,9 @@ class TestGetStackTrace(unittest.TestCase):
expected_stack_trace = [ expected_stack_trace = [
[ [
("gen_nested_call", script_name, 11), ("gen_nested_call", script_name, 10),
("gen", script_name, 17), ("gen", script_name, 16),
("main", script_name, 20), ("main", script_name, 19),
], ],
"Task-1", "Task-1",
[], [],
@ -365,8 +363,7 @@ class TestGetStackTrace(unittest.TestCase):
async def deep(): async def deep():
await asyncio.sleep(0) await asyncio.sleep(0)
sock.sendall(b"ready") sock.sendall(b"ready"); time.sleep(10_000) # same line number
time.sleep(10000)
async def c1(): async def c1():
await asyncio.sleep(0) await asyncio.sleep(0)
@ -413,9 +410,9 @@ class TestGetStackTrace(unittest.TestCase):
stack_trace[2].sort(key=lambda x: x[1]) stack_trace[2].sort(key=lambda x: x[1])
expected_stack_trace = [ expected_stack_trace = [
[("deep", script_name, ANY), ("c1", script_name, 16)], [("deep", script_name, 11), ("c1", script_name, 15)],
"Task-2", "Task-2",
[[[("main", script_name, 22)], "Task-1", []]], [[[("main", script_name, 21)], "Task-1", []]],
] ]
self.assertEqual(stack_trace, expected_stack_trace) self.assertEqual(stack_trace, expected_stack_trace)
@ -439,15 +436,14 @@ class TestGetStackTrace(unittest.TestCase):
async def deep(): async def deep():
await asyncio.sleep(0) await asyncio.sleep(0)
sock.sendall(b"ready") sock.sendall(b"ready"); time.sleep(10_000) # same line number
time.sleep(10000)
async def c1(): async def c1():
await asyncio.sleep(0) await asyncio.sleep(0)
await deep() await deep()
async def c2(): async def c2():
await asyncio.sleep(10000) await asyncio.sleep(10_000)
async def main(): async def main():
await asyncio.staggered.staggered_race( await asyncio.staggered.staggered_race(
@ -490,8 +486,8 @@ class TestGetStackTrace(unittest.TestCase):
stack_trace[2].sort(key=lambda x: x[1]) stack_trace[2].sort(key=lambda x: x[1])
expected_stack_trace = [ expected_stack_trace = [
[ [
("deep", script_name, ANY), ("deep", script_name, 11),
("c1", script_name, 16), ("c1", script_name, 15),
("staggered_race.<locals>.run_one_coro", staggered.__file__, ANY), ("staggered_race.<locals>.run_one_coro", staggered.__file__, ANY),
], ],
"Task-2", "Task-2",
@ -499,7 +495,7 @@ class TestGetStackTrace(unittest.TestCase):
[ [
[ [
("staggered_race", staggered.__file__, ANY), ("staggered_race", staggered.__file__, ANY),
("main", script_name, 22), ("main", script_name, 21),
], ],
"Task-1", "Task-1",
[], [],