Revert "test_broken_timelines: wait for tenants to load"

This reverts commit c6f9b8f318.

test_runner/fixtures/pageserver/utils.py

@@ -4,7 +4,6 @@ from typing import Optional
 from fixtures.log_helper import log
 from fixtures.pageserver.http import PageserverHttpClient
 from fixtures.types import Lsn, TenantId, TimelineId
-from fixtures.utils import wait_until
 
 
 def assert_tenant_state(
@@ -108,19 +107,6 @@ def wait_until_tenant_active(
     )
 
 
-def assert_all_tenants_to_exit_loading_state(pageserver_http: PageserverHttpClient):
-    states = [t["state"]["slug"] != "Loading" for t in pageserver_http.tenant_list()]
-    assert all(states)
-
-
-def wait_for_all_tenants_to_exit_loading_state(
-    pageserver_http: PageserverHttpClient, iterations: int = 25, interval: float = 0.2
-):
-    wait_until(
-        iterations, interval, lambda: assert_all_tenants_to_exit_loading_state(pageserver_http)
-    )
-
-
 def last_record_lsn(
     pageserver_http_client: PageserverHttpClient, tenant: TenantId, timeline: TimelineId
 ) -> Lsn:

test_runner/regress/test_broken_timeline.py

@@ -5,9 +5,6 @@ from typing import List, Tuple
 import pytest
 from fixtures.log_helper import log
 from fixtures.neon_fixtures import Endpoint, NeonEnv, NeonEnvBuilder
-from fixtures.pageserver.utils import (
-    wait_for_all_tenants_to_exit_loading_state,
-)
 from fixtures.types import TenantId, TimelineId
 
 
@@ -15,7 +12,6 @@ from fixtures.types import TenantId, TimelineId
 # running.
 def test_broken_timeline(neon_env_builder: NeonEnvBuilder):
     env = neon_env_builder.init_start()
-    client = env.pageserver.http_client()
 
     env.pageserver.allowed_errors.extend(
         [
@@ -76,8 +72,6 @@ def test_broken_timeline(neon_env_builder: NeonEnvBuilder):
 
     env.pageserver.start()
 
-    wait_for_all_tenants_to_exit_loading_state(client)
-
     # Tenant 0 should still work
     pg0.start()
     assert pg0.safe_psql("SELECT COUNT(*) FROM t")[0][0] == 100