Skip to content

test: fix two flaky integration tests #1324

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
bigbes merged 1 commit into from
Jul 20, 2026
Merged

test: fix two flaky integration tests #1324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions test/integration/cluster/test_cluster_publish.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ def test_cluster_publish_config_no_auth(
tt_cmd,
"cluster",
"publish",
f"{instance.endpoint}/prefix?timeout=0.1",
f"{instance.endpoint}/prefix?timeout=5",
"src.yaml",
]
instance_process = subprocess.Popen(
Expand Down Expand Up @@ -784,7 +784,7 @@ def test_cluster_publish_config_bad_auth(
tt_cmd,
"cluster",
"publish",
f"http://invalid_user:invalid_pass@{instance.endpoint}/prefix?timeout=0.1",
f"http://invalid_user:invalid_pass@{instance.endpoint}/prefix?timeout=5",
"src.yaml",
]
instance_process = subprocess.Popen(
Expand Down
4 changes: 2 additions & 2 deletions test/integration/cluster/test_cluster_roles_add.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def test_cluster_rs_roles_add_no_auth(
"roles",
"add",
"-f",
f"{instance.endpoint}/prefix?timeout=0.1",
f"{instance.endpoint}/prefix?timeout=5",
"role",
"-G",
]
Expand Down Expand Up @@ -97,7 +97,7 @@ def test_cluster_rs_roles_add_bad_auth(
"rs",
"roles",
"add",
f"http://invalid_user:invalid:pass@{instance.endpoint}/prefix?timeout=0.1",
f"http://invalid_user:invalid:pass@{instance.endpoint}/prefix?timeout=5",
"role",
"-G",
]
Expand Down
4 changes: 2 additions & 2 deletions test/integration/cluster/test_cluster_roles_remove.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def test_cluster_rs_roles_remove_no_auth(
"roles",
"remove",
"-f",
f"{instance.endpoint}/prefix?timeout=0.1",
f"{instance.endpoint}/prefix?timeout=5",
"role",
"-G",
]
Expand Down Expand Up @@ -100,7 +100,7 @@ def test_cluster_rs_roles_remove_bad_auth(
"rs",
"roles",
"remove",
f"http://invalid_user:invalid:pass@{instance.endpoint}/prefix?timeout=0.1",
f"http://invalid_user:invalid:pass@{instance.endpoint}/prefix?timeout=5",
"role",
"-G",
]
Expand Down
10 changes: 7 additions & 3 deletions test/integration/restart/test_restart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ def read_file(path):
return False
return True

return utils.wait_event(5, all_pids_changed)
# A restarted instance writes its PID file only once it has been spawned,
# which a loaded CI runner can drag out well past a few seconds.
return utils.wait_event(30, all_pids_changed)


def check_restart(tt, tt_app, target, input, is_confirm, *args):
Expand All @@ -98,8 +100,10 @@ def check_restart(tt, tt_app, target, input, is_confirm, *args):
discarding_msg = "Restart is cancelled."
if is_confirm:
assert discarding_msg not in out
# Make sure all involved PIDs are updated.
wait_pid_files_changed(tt_app, target_instances, orig_status)
# Make sure all involved PIDs are updated. A timeout here must fail
# loudly: otherwise the checks below race the instance start and report
# a bare "NOT RUNNING" instead.
assert wait_pid_files_changed(tt_app, target_instances, orig_status)
else:
# Check the discarding message.
assert discarding_msg in out
Expand Down
Loading