From 68b3e68642bf91f12bcf15c00e596411e1cf85b2 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Mon, 20 Mar 2023 17:17:25 +0100 Subject: [PATCH] refactor: PageserverHttpClient method for breaking tenant from tests --- test_runner/fixtures/neon_fixtures.py | 4 ++++ test_runner/regress/test_disk_usage_eviction.py | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py index db80057c71..de08457e6b 100644 --- a/test_runner/fixtures/neon_fixtures.py +++ b/test_runner/fixtures/neon_fixtures.py @@ -1546,6 +1546,10 @@ class PageserverHttpClient(requests.Session): self.verbose_error(res) return res.json() + def tenant_break(self, tenant_id: TenantId): + res = self.put(f"http://localhost:{self.port}/v1/tenant/{tenant_id}/break") + self.verbose_error(res) + @dataclass class TenantConfig: diff --git a/test_runner/regress/test_disk_usage_eviction.py b/test_runner/regress/test_disk_usage_eviction.py index 54a42cc0cf..6ba44dae59 100644 --- a/test_runner/regress/test_disk_usage_eviction.py +++ b/test_runner/regress/test_disk_usage_eviction.py @@ -101,10 +101,7 @@ def eviction_env(request, neon_env_builder: NeonEnvBuilder, pg_bin: PgBin) -> It # break the difficult to use initial default tenant, later assert that it has not been evicted broken_tenant_id, broken_timeline_id = (env.initial_tenant, env.initial_timeline) assert broken_timeline_id is not None - res = pageserver_http.put( - f"http://localhost:{pageserver_http.port}/v1/tenant/{env.initial_tenant}/break" - ) - pageserver_http.verbose_error(res) + pageserver_http.tenant_break(env.initial_tenant) (broken_on_disk_before, _, _) = poor_mans_du( env, timelines=[(broken_tenant_id, broken_timeline_id)] )