From c025617639c73eace772d77a076fa62e9c37c77e Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Thu, 4 May 2023 12:01:40 +0200 Subject: [PATCH] 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. --- test_runner/fixtures/pageserver/utils.py | 4 +++- test_runner/regress/test_remote_storage.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test_runner/fixtures/pageserver/utils.py b/test_runner/fixtures/pageserver/utils.py index 7f8bb40bda..c558387413 100644 --- a/test_runner/fixtures/pageserver/utils.py +++ b/test_runner/fixtures/pageserver/utils.py @@ -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( diff --git a/test_runner/regress/test_remote_storage.py b/test_runner/regress/test_remote_storage.py index 9841647bf3..04c206fc71 100644 --- a/test_runner/regress/test_remote_storage.py +++ b/test_runner/regress/test_remote_storage.py @@ -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()