Skip to content

Improve robustness of subshell concurrency tests #1285

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
ianthomas23 merged 2 commits into from
Oct 25, 2024
Merged

Improve robustness of subshell concurrency tests #1285

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68690c2
Improve robustness of subshell concurrency tests
ianthomas23 Oct 25, 2024
f9a1a47
Put test_run_concurrently_sequence timing back to 0.2 s
ianthomas23 Oct 25, 2024
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
20 changes: 13 additions & 7 deletions tests/test_subshells.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,20 @@ def test_run_concurrently_sequence(are_subshells, overlap):
create_subshell_helper(kc)["subshell_id"] if is_subshell else None
for is_subshell in are_subshells
]

# Import time module before running time-sensitive subshell code.
execute_request_subshell_id(kc, "import time; print('ok')", None)

sleep = 0.2
if overlap:
codes = [
"import time; start0=True; end0=False; time.sleep(0.2); end0=True",
"assert start0; assert not end0; time.sleep(0.2); assert end0",
f"start0=True; end0=False; time.sleep({sleep}); end0=True",
f"time.sleep({sleep/2}); assert start0; assert not end0; time.sleep({sleep}); assert end0",
]
else:
codes = [
"import time; start0=True; end0=False; time.sleep(0.2); assert end1",
"assert start0; assert not end0; end1=True",
f"start0=True; end0=False; time.sleep({sleep}); assert end1",
f"time.sleep({sleep/2}); assert start0; assert not end0; end1=True",
]

msgs = []
Expand All @@ -150,8 +155,6 @@ def test_run_concurrently_sequence(are_subshells, overlap):
msg["header"]["subshell_id"] = subshell_id
kc.shell_channel.send(msg)
msgs.append(msg)
if len(msgs) == 1:
time.sleep(0.1) # Wait for first execute_request to start.

replies = get_replies(kc, [msg["msg_id"] for msg in msgs])

Expand All @@ -171,13 +174,16 @@ def test_run_concurrently_timing(include_main_shell):
create_subshell_helper(kc)["subshell_id"],
]

# Import time module before running time-sensitive subshell code.
execute_request_subshell_id(kc, "import time; print('ok')", None)

times = (0.2, 0.2)
# Prepare messages, times are sleep times in seconds.
# Identical times for both subshells is a harder test as preparing and sending
# the execute_reply messages may overlap.
msgs = []
for id, sleep in zip(subshell_ids, times):
code = f"import time; time.sleep({sleep})"
code = f"time.sleep({sleep})"
msg = kc.session.msg("execute_request", {"code": code})
msg["header"]["subshell_id"] = id
msgs.append(msg)
Expand Down