actually give it 5 seconds, not 2.5 (and drive-by fix the error message)

CI release test failed due to this timeout, likely due to system load.
The debug test was not affected.
This commit is contained in:
Christian Schwarz
2023-05-04 12:01:40 +02:00
parent b8eba89a10
commit c025617639
2 changed files with 5 additions and 3 deletions

View File

@@ -87,7 +87,9 @@ def wait_until_tenant_state(
time.sleep(period)
raise Exception(f"Tenant {tenant_id} did not become {expected_state} in {iterations} seconds")
raise Exception(
f"Tenant {tenant_id} did not become {expected_state} within {iterations * period} seconds"
)
def wait_until_tenant_active(

View File

@@ -834,7 +834,7 @@ def test_timeline_resurrection_on_attach(
ps_http.tenant_attach(tenant_id=tenant_id)
wait_until_tenant_active(ps_http, tenant_id=tenant_id, iterations=5, period=0.5)
wait_until_tenant_active(ps_http, tenant_id=tenant_id, iterations=10, period=0.5)
timelines = ps_http.timeline_list(tenant_id=tenant_id)
assert {TimelineId(tl["timeline_id"]) for tl in timelines} == {
@@ -895,7 +895,7 @@ def test_timeline_delete_fail_before_local_delete(neon_env_builder: NeonEnvBuild
env.pageserver.start()
# Wait for tenant to finish loading.
wait_until_tenant_active(ps_http, tenant_id=env.initial_tenant, iterations=5, period=0.5)
wait_until_tenant_active(ps_http, tenant_id=env.initial_tenant, iterations=10, period=0.5)
assert (
not leaf_timeline_path.exists()