From 70977afd07b69b0fe46b75cf5aa903cf9cd60f24 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Sat, 4 May 2024 15:14:34 +0000 Subject: [PATCH] ruff check & format --- test_runner/performance/test_branch_creation.py | 1 + test_runner/regress/test_disk_usage_eviction.py | 1 - test_runner/regress/test_pageserver_generations.py | 8 +++++--- test_runner/regress/test_storage_controller.py | 8 +++++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/test_runner/performance/test_branch_creation.py b/test_runner/performance/test_branch_creation.py index 8709310748..6ee8e5ed65 100644 --- a/test_runner/performance/test_branch_creation.py +++ b/test_runner/performance/test_branch_creation.py @@ -144,6 +144,7 @@ def test_branch_creation_many(neon_compare: NeonCompare, n_branches: int, shape: config["compaction_period"] = "3s" config["gc_period"] = "0s" return True + env.pageserver.edit_config_toml(patch_default_tenant_config) env.pageserver.start( # this does print more than we want, but the number should be comparable between runs diff --git a/test_runner/regress/test_disk_usage_eviction.py b/test_runner/regress/test_disk_usage_eviction.py index 21fde449f1..f1ef676cae 100644 --- a/test_runner/regress/test_disk_usage_eviction.py +++ b/test_runner/regress/test_disk_usage_eviction.py @@ -5,7 +5,6 @@ from dataclasses import dataclass from typing import Any, Dict, Iterable, Tuple import pytest -import toml from fixtures.log_helper import log from fixtures.neon_fixtures import ( NeonEnv, diff --git a/test_runner/regress/test_pageserver_generations.py b/test_runner/regress/test_pageserver_generations.py index eaa81e2ac8..f957bea156 100644 --- a/test_runner/regress/test_pageserver_generations.py +++ b/test_runner/regress/test_pageserver_generations.py @@ -530,9 +530,11 @@ def test_emergency_mode(neon_env_builder: NeonEnvBuilder, pg_bin: PgBin): # incident, but it might be unavoidable: if so, we want to be able to start up # and serve clients. env.pageserver.stop() # Non-immediate: implicitly checking that shutdown doesn't hang waiting for CP - replaced = env.pageserver.patch_config_toml_nonrecursive({ - "control_plane_emergency_mode": True, - }) + replaced = env.pageserver.patch_config_toml_nonrecursive( + { + "control_plane_emergency_mode": True, + } + ) env.pageserver.start() # The pageserver should provide service to clients diff --git a/test_runner/regress/test_storage_controller.py b/test_runner/regress/test_storage_controller.py index f9130c00cc..bdd356388f 100644 --- a/test_runner/regress/test_storage_controller.py +++ b/test_runner/regress/test_storage_controller.py @@ -290,9 +290,11 @@ def test_storage_controller_onboarding(neon_env_builder: NeonEnvBuilder, warm_up # This is the pageserver where we'll initially create the tenant. Run it in emergency # mode so that it doesn't talk to storage controller, and do not register it. env.pageservers[0].allowed_errors.append(".*Emergency mode!.*") - env.pageservers[0].patch_config_toml_nonrecursive({ - "control_plane_emergency_mode": True, - }) + env.pageservers[0].patch_config_toml_nonrecursive( + { + "control_plane_emergency_mode": True, + } + ) env.pageservers[0].start() origin_ps = env.pageservers[0]