From 41aa627ec0a36e89e1317b81adbd95c37b26fcd9 Mon Sep 17 00:00:00 2001 From: John Spray Date: Fri, 1 Sep 2023 17:29:38 +0100 Subject: [PATCH] tests: get test name automatically for remote storage (#5184) ## Problem Tests using remote storage have manually entered `test_name` parameters, which: - Are easy to accidentally duplicate when copying code to make a new test - Omit parameters, so don't actually create unique S3 buckets when running many tests concurrently. ## Summary of changes - Use the `request` fixture in neon_env_builder fixture to get the test name, then munge that into an S3 compatible bucket name. - Remove the explicit `test_name` parameters to enable_remote_storage --- test_runner/fixtures/neon_fixtures.py | 16 ++++++++++++--- .../regress/test_attach_tenant_config.py | 2 -- .../regress/test_disk_usage_eviction.py | 2 +- .../regress/test_download_extensions.py | 4 ---- test_runner/regress/test_gc_aggressive.py | 1 - test_runner/regress/test_layer_eviction.py | 2 -- test_runner/regress/test_metric_collection.py | 1 - test_runner/regress/test_ondemand_download.py | 6 ------ test_runner/regress/test_remote_storage.py | 7 ------- test_runner/regress/test_tenant_conf.py | 2 -- test_runner/regress/test_tenant_delete.py | 6 +----- test_runner/regress/test_tenant_detach.py | 9 --------- test_runner/regress/test_tenant_relocation.py | 2 -- test_runner/regress/test_tenants.py | 2 -- .../test_tenants_with_remote_storage.py | 3 --- .../regress/test_threshold_based_eviction.py | 3 +-- test_runner/regress/test_timeline_delete.py | 12 ++--------- test_runner/regress/test_timeline_size.py | 20 +++++-------------- test_runner/regress/test_wal_acceptor.py | 2 -- 19 files changed, 23 insertions(+), 79 deletions(-) diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py index b2cd0fe968..3936736e56 100644 --- a/test_runner/fixtures/neon_fixtures.py +++ b/test_runner/fixtures/neon_fixtures.py @@ -414,6 +414,7 @@ class NeonEnvBuilder: neon_binpath: Path, pg_distrib_dir: Path, pg_version: PgVersion, + test_name: str, remote_storage: Optional[RemoteStorage] = None, remote_storage_users: RemoteStorageUsers = RemoteStorageUsers.PAGESERVER, pageserver_config_override: Optional[str] = None, @@ -455,6 +456,11 @@ class NeonEnvBuilder: self.initial_tenant = initial_tenant or TenantId.generate() self.initial_timeline = initial_timeline or TimelineId.generate() + assert test_name.startswith( + "test_" + ), "Unexpectedly instantiated from outside a test function" + self.test_name = test_name + def init_configs(self) -> NeonEnv: # Cannot create more than one environment from one builder assert self.env is None, "environment already initialized" @@ -486,23 +492,24 @@ class NeonEnvBuilder: def enable_remote_storage( self, remote_storage_kind: RemoteStorageKind, - test_name: str, force_enable: bool = True, enable_remote_extensions: bool = False, ): + bucket_name = re.sub(r"[_\[\]]", "-", self.test_name)[:63] + if remote_storage_kind == RemoteStorageKind.NOOP: return elif remote_storage_kind == RemoteStorageKind.LOCAL_FS: self.enable_local_fs_remote_storage(force_enable=force_enable) elif remote_storage_kind == RemoteStorageKind.MOCK_S3: self.enable_mock_s3_remote_storage( - bucket_name=test_name, + bucket_name=bucket_name, force_enable=force_enable, enable_remote_extensions=enable_remote_extensions, ) elif remote_storage_kind == RemoteStorageKind.REAL_S3: self.enable_real_s3_remote_storage( - test_name=test_name, + test_name=bucket_name, force_enable=force_enable, enable_remote_extensions=enable_remote_extensions, ) @@ -949,6 +956,7 @@ def _shared_simple_env( pg_version=pg_version, run_id=run_id, preserve_database_files=pytestconfig.getoption("--preserve-database-files"), + test_name=request.node.name, ) as builder: env = builder.init_start() @@ -984,6 +992,7 @@ def neon_env_builder( pg_version: PgVersion, default_broker: NeonBroker, run_id: uuid.UUID, + request: FixtureRequest, ) -> Iterator[NeonEnvBuilder]: """ Fixture to create a Neon environment for test. @@ -1012,6 +1021,7 @@ def neon_env_builder( broker=default_broker, run_id=run_id, preserve_database_files=pytestconfig.getoption("--preserve-database-files"), + test_name=request.node.name, ) as builder: yield builder diff --git a/test_runner/regress/test_attach_tenant_config.py b/test_runner/regress/test_attach_tenant_config.py index bc6afa84a1..1acf429c52 100644 --- a/test_runner/regress/test_attach_tenant_config.py +++ b/test_runner/regress/test_attach_tenant_config.py @@ -16,7 +16,6 @@ from fixtures.utils import wait_until def positive_env(neon_env_builder: NeonEnvBuilder) -> NeonEnv: neon_env_builder.enable_remote_storage( remote_storage_kind=RemoteStorageKind.LOCAL_FS, - test_name="test_attach_tenant_config", ) env = neon_env_builder.init_start() @@ -39,7 +38,6 @@ class NegativeTests: def negative_env(neon_env_builder: NeonEnvBuilder) -> Generator[NegativeTests, None, None]: neon_env_builder.enable_remote_storage( remote_storage_kind=RemoteStorageKind.LOCAL_FS, - test_name="test_attach_tenant_config", ) env = neon_env_builder.init_start() assert isinstance(env.remote_storage, LocalFsStorage) diff --git a/test_runner/regress/test_disk_usage_eviction.py b/test_runner/regress/test_disk_usage_eviction.py index 182069315e..cdbd02de03 100644 --- a/test_runner/regress/test_disk_usage_eviction.py +++ b/test_runner/regress/test_disk_usage_eviction.py @@ -135,7 +135,7 @@ def eviction_env(request, neon_env_builder: NeonEnvBuilder, pg_bin: PgBin) -> Ev log.info(f"setting up eviction_env for test {request.node.name}") - neon_env_builder.enable_remote_storage(RemoteStorageKind.LOCAL_FS, f"{request.node.name}") + neon_env_builder.enable_remote_storage(RemoteStorageKind.LOCAL_FS) # initial tenant will not be present on this pageserver env = neon_env_builder.init_configs() diff --git a/test_runner/regress/test_download_extensions.py b/test_runner/regress/test_download_extensions.py index b208616345..54f51414bb 100644 --- a/test_runner/regress/test_download_extensions.py +++ b/test_runner/regress/test_download_extensions.py @@ -90,7 +90,6 @@ def test_remote_extensions( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_remote_extensions", enable_remote_extensions=True, ) env = neon_env_builder.init_start() @@ -157,7 +156,6 @@ def test_remote_library( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_remote_library", enable_remote_extensions=True, ) env = neon_env_builder.init_start() @@ -218,7 +216,6 @@ def test_multiple_extensions_one_archive( ): neon_env_builder.enable_remote_storage( remote_storage_kind=RemoteStorageKind.REAL_S3, - test_name="test_multiple_extensions_one_archive", enable_remote_extensions=True, ) env = neon_env_builder.init_start() @@ -266,7 +263,6 @@ def test_extension_download_after_restart( neon_env_builder.enable_remote_storage( remote_storage_kind=RemoteStorageKind.MOCK_S3, - test_name="test_extension_download_after_restart", enable_remote_extensions=True, ) env = neon_env_builder.init_start() diff --git a/test_runner/regress/test_gc_aggressive.py b/test_runner/regress/test_gc_aggressive.py index be817521cd..8d7a42a805 100644 --- a/test_runner/regress/test_gc_aggressive.py +++ b/test_runner/regress/test_gc_aggressive.py @@ -102,7 +102,6 @@ def test_gc_index_upload(neon_env_builder: NeonEnvBuilder, remote_storage_kind: neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_gc_index_upload", ) env = neon_env_builder.init_start() diff --git a/test_runner/regress/test_layer_eviction.py b/test_runner/regress/test_layer_eviction.py index 8f627defb5..c939ace803 100644 --- a/test_runner/regress/test_layer_eviction.py +++ b/test_runner/regress/test_layer_eviction.py @@ -21,7 +21,6 @@ def test_basic_eviction( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_download_remote_layers_api", ) env = neon_env_builder.init_start( @@ -157,7 +156,6 @@ def test_basic_eviction( def test_gc_of_remote_layers(neon_env_builder: NeonEnvBuilder): neon_env_builder.enable_remote_storage( remote_storage_kind=RemoteStorageKind.LOCAL_FS, - test_name="test_gc_of_remote_layers", ) env = neon_env_builder.init_start() diff --git a/test_runner/regress/test_metric_collection.py b/test_runner/regress/test_metric_collection.py index 3f4b42707a..e4641cff05 100644 --- a/test_runner/regress/test_metric_collection.py +++ b/test_runner/regress/test_metric_collection.py @@ -96,7 +96,6 @@ def test_metric_collection( neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_metric_collection", ) log.info(f"test_metric_collection endpoint is {metric_collection_endpoint}") diff --git a/test_runner/regress/test_ondemand_download.py b/test_runner/regress/test_ondemand_download.py index a4e86e0519..0ca6a7a595 100644 --- a/test_runner/regress/test_ondemand_download.py +++ b/test_runner/regress/test_ondemand_download.py @@ -54,7 +54,6 @@ def test_ondemand_download_large_rel( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_ondemand_download_large_rel", ) # thinking about using a shared environment? the test assumes that global @@ -157,7 +156,6 @@ def test_ondemand_download_timetravel( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_ondemand_download_timetravel", ) # thinking about using a shared environment? the test assumes that global @@ -319,7 +317,6 @@ def test_download_remote_layers_api( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_download_remote_layers_api", ) ##### First start, insert data and upload it to the remote storage @@ -481,7 +478,6 @@ def test_compaction_downloads_on_demand_without_image_creation( """ neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_compaction_downloads_on_demand_without_image_creation", ) conf = { @@ -569,7 +565,6 @@ def test_compaction_downloads_on_demand_with_image_creation( """ neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_compaction_downloads_on_demand", ) conf = { @@ -670,7 +665,6 @@ def test_ondemand_download_failure_to_replace( neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_ondemand_download_failure_to_replace", ) # disable gc and compaction via default tenant config because config is lost while detaching diff --git a/test_runner/regress/test_remote_storage.py b/test_runner/regress/test_remote_storage.py index 0bd365efaa..8b75d35200 100644 --- a/test_runner/regress/test_remote_storage.py +++ b/test_runner/regress/test_remote_storage.py @@ -62,7 +62,6 @@ def test_remote_storage_backup_and_restore( neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_remote_storage_backup_and_restore", ) # Exercise retry code path by making all uploads and downloads fail for the @@ -225,7 +224,6 @@ def test_remote_storage_upload_queue_retries( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_remote_storage_upload_queue_retries", ) env = neon_env_builder.init_start() @@ -381,7 +379,6 @@ def test_remote_timeline_client_calls_started_metric( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_remote_timeline_client_metrics", ) # thinking about using a shared environment? the test assumes that global @@ -524,7 +521,6 @@ def test_timeline_deletion_with_files_stuck_in_upload_queue( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_timeline_deletion_with_files_stuck_in_upload_queue", ) env = neon_env_builder.init_start( @@ -642,7 +638,6 @@ def test_empty_branch_remote_storage_upload( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_empty_branch_remote_storage_upload", ) env = neon_env_builder.init_start() @@ -694,7 +689,6 @@ def test_empty_branch_remote_storage_upload_on_restart( """ neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_empty_branch_remote_storage_upload_on_restart", ) env = neon_env_builder.init_start() @@ -792,7 +786,6 @@ def test_compaction_delete_before_upload( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_compaction_delete_before_upload", ) env = neon_env_builder.init_start( diff --git a/test_runner/regress/test_tenant_conf.py b/test_runner/regress/test_tenant_conf.py index 60ec532db4..93ba5477a6 100644 --- a/test_runner/regress/test_tenant_conf.py +++ b/test_runner/regress/test_tenant_conf.py @@ -294,7 +294,6 @@ eviction_policy = { "kind" = "LayerAccessThreshold", period = "20s", threshold = def test_creating_tenant_conf_after_attach(neon_env_builder: NeonEnvBuilder): neon_env_builder.enable_remote_storage( remote_storage_kind=RemoteStorageKind.LOCAL_FS, - test_name="test_creating_tenant_conf_after_attach", ) env = neon_env_builder.init_start() @@ -339,7 +338,6 @@ def test_live_reconfig_get_evictions_low_residence_duration_metric_threshold( ): neon_env_builder.enable_remote_storage( remote_storage_kind=RemoteStorageKind.LOCAL_FS, - test_name="test_live_reconfig_get_evictions_low_residence_duration_metric_threshold", ) env = neon_env_builder.init_start() diff --git a/test_runner/regress/test_tenant_delete.py b/test_runner/regress/test_tenant_delete.py index 7519e5bf23..c7324cac83 100644 --- a/test_runner/regress/test_tenant_delete.py +++ b/test_runner/regress/test_tenant_delete.py @@ -43,7 +43,6 @@ def test_tenant_delete_smoke( neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_tenant_delete_smoke", ) env = neon_env_builder.init_start() @@ -177,9 +176,7 @@ def test_delete_tenant_exercise_crash_safety_failpoints( if simulate_failures: neon_env_builder.pageserver_config_override = "test_remote_failures=1" - neon_env_builder.enable_remote_storage( - remote_storage_kind, "test_delete_tenant_exercise_crash_safety_failpoints" - ) + neon_env_builder.enable_remote_storage(remote_storage_kind) env = neon_env_builder.init_start(initial_tenant_conf=MANY_SMALL_LAYERS_TENANT_CONFIG) @@ -300,7 +297,6 @@ def test_tenant_delete_is_resumed_on_attach( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_deleted_tenant_ignored_on_attach", ) env = neon_env_builder.init_start(initial_tenant_conf=MANY_SMALL_LAYERS_TENANT_CONFIG) diff --git a/test_runner/regress/test_tenant_detach.py b/test_runner/regress/test_tenant_detach.py index d2302ca1af..20526cd0a9 100644 --- a/test_runner/regress/test_tenant_detach.py +++ b/test_runner/regress/test_tenant_detach.py @@ -46,7 +46,6 @@ def test_tenant_reattach( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_tenant_reattach", ) # Exercise retry code path by making all uploads and downloads fail for the @@ -231,7 +230,6 @@ def test_tenant_reattach_while_busy( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_tenant_reattach_while_busy", ) env = neon_env_builder.init_start() @@ -453,7 +451,6 @@ def test_detach_while_attaching( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_detach_while_attaching", ) ##### First start, insert secret data and upload it to the remote storage @@ -537,7 +534,6 @@ def test_ignored_tenant_reattach( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_ignored_tenant_reattach", ) env = neon_env_builder.init_start() pageserver_http = env.pageserver.http_client() @@ -609,7 +605,6 @@ def test_ignored_tenant_download_missing_layers( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_ignored_tenant_download_and_attach", ) env = neon_env_builder.init_start() pageserver_http = env.pageserver.http_client() @@ -675,7 +670,6 @@ def test_ignored_tenant_stays_broken_without_metadata( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_ignored_tenant_stays_broken_without_metadata", ) env = neon_env_builder.init_start() pageserver_http = env.pageserver.http_client() @@ -719,7 +713,6 @@ def test_load_attach_negatives( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_load_attach_negatives", ) env = neon_env_builder.init_start() pageserver_http = env.pageserver.http_client() @@ -764,7 +757,6 @@ def test_ignore_while_attaching( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_ignore_while_attaching", ) env = neon_env_builder.init_start() @@ -868,7 +860,6 @@ def test_metrics_while_ignoring_broken_tenant_and_reloading( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_metrics_while_ignoring_broken_tenant_and_reloading", ) env = neon_env_builder.init_start() diff --git a/test_runner/regress/test_tenant_relocation.py b/test_runner/regress/test_tenant_relocation.py index 32ad5381b4..6a81ff498e 100644 --- a/test_runner/regress/test_tenant_relocation.py +++ b/test_runner/regress/test_tenant_relocation.py @@ -526,7 +526,6 @@ def test_emergency_relocate_with_branches_slow_replay( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_emergency_relocate_with_branches_slow_replay", ) env = neon_env_builder.init_start() @@ -683,7 +682,6 @@ def test_emergency_relocate_with_branches_createdb( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_emergency_relocate_with_branches_createdb", ) env = neon_env_builder.init_start() diff --git a/test_runner/regress/test_tenants.py b/test_runner/regress/test_tenants.py index 19bc3ed37c..985bd63b24 100644 --- a/test_runner/regress/test_tenants.py +++ b/test_runner/regress/test_tenants.py @@ -244,7 +244,6 @@ def test_pageserver_metrics_removed_after_detach( neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_pageserver_metrics_removed_after_detach", ) neon_env_builder.num_safekeepers = 3 @@ -305,7 +304,6 @@ def test_pageserver_with_empty_tenants( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_pageserver_with_empty_tenants", ) env = neon_env_builder.init_start() diff --git a/test_runner/regress/test_tenants_with_remote_storage.py b/test_runner/regress/test_tenants_with_remote_storage.py index 2925f8c2da..6a541c8a37 100644 --- a/test_runner/regress/test_tenants_with_remote_storage.py +++ b/test_runner/regress/test_tenants_with_remote_storage.py @@ -64,7 +64,6 @@ async def all_tenants_workload(env: NeonEnv, tenants_endpoints): def test_tenants_many(neon_env_builder: NeonEnvBuilder, remote_storage_kind: RemoteStorageKind): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_tenants_many", ) env = neon_env_builder.init_start() @@ -117,7 +116,6 @@ def test_tenants_attached_after_download( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="remote_storage_kind", ) data_id = 1 @@ -232,7 +230,6 @@ def test_tenant_redownloads_truncated_file_on_startup( # since we now store the layer file length metadata, we notice on startup that a layer file is of wrong size, and proceed to redownload it. neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_tenant_redownloads_truncated_file_on_startup", ) env = neon_env_builder.init_start() diff --git a/test_runner/regress/test_threshold_based_eviction.py b/test_runner/regress/test_threshold_based_eviction.py index a0e423e7ff..739a9a5b74 100644 --- a/test_runner/regress/test_threshold_based_eviction.py +++ b/test_runner/regress/test_threshold_based_eviction.py @@ -16,13 +16,12 @@ from pytest_httpserver import HTTPServer def test_threshold_based_eviction( - request, httpserver: HTTPServer, httpserver_listen_address, pg_bin: PgBin, neon_env_builder: NeonEnvBuilder, ): - neon_env_builder.enable_remote_storage(RemoteStorageKind.LOCAL_FS, f"{request.node.name}") + neon_env_builder.enable_remote_storage(RemoteStorageKind.LOCAL_FS) # Start with metrics collection enabled, so that the eviction task # imitates its accesses. We'll use a non-existent endpoint to make it fail. diff --git a/test_runner/regress/test_timeline_delete.py b/test_runner/regress/test_timeline_delete.py index 6ed437d23b..0ce714d185 100644 --- a/test_runner/regress/test_timeline_delete.py +++ b/test_runner/regress/test_timeline_delete.py @@ -191,9 +191,7 @@ def test_delete_timeline_exercise_crash_safety_failpoints( 8. Retry or restart without the failpoint and check the result. """ - neon_env_builder.enable_remote_storage( - remote_storage_kind, "test_delete_timeline_exercise_crash_safety_failpoints" - ) + neon_env_builder.enable_remote_storage(remote_storage_kind) env = neon_env_builder.init_start( initial_tenant_conf={ @@ -350,7 +348,6 @@ def test_timeline_resurrection_on_attach( neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_timeline_resurrection_on_attach", ) ##### First start, insert data and upload it to the remote storage @@ -438,7 +435,6 @@ def test_timeline_delete_fail_before_local_delete(neon_env_builder: NeonEnvBuild neon_env_builder.enable_remote_storage( remote_storage_kind=RemoteStorageKind.MOCK_S3, - test_name="test_timeline_delete_fail_before_local_delete", ) env = neon_env_builder.init_start() @@ -558,7 +554,6 @@ def test_concurrent_timeline_delete_stuck_on( neon_env_builder.enable_remote_storage( remote_storage_kind=RemoteStorageKind.MOCK_S3, - test_name=f"concurrent_timeline_delete_stuck_on_{stuck_failpoint}", ) env = neon_env_builder.init_start() @@ -636,7 +631,6 @@ def test_delete_timeline_client_hangup(neon_env_builder: NeonEnvBuilder): """ neon_env_builder.enable_remote_storage( remote_storage_kind=RemoteStorageKind.MOCK_S3, - test_name="test_delete_timeline_client_hangup", ) env = neon_env_builder.init_start() @@ -706,7 +700,6 @@ def test_timeline_delete_works_for_remote_smoke( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_timeline_delete_works_for_remote_smoke", ) env = neon_env_builder.init_start() @@ -780,7 +773,7 @@ def test_delete_orphaned_objects( pg_bin: PgBin, ): remote_storage_kind = RemoteStorageKind.LOCAL_FS - neon_env_builder.enable_remote_storage(remote_storage_kind, "test_delete_orphaned_objects") + neon_env_builder.enable_remote_storage(remote_storage_kind) env = neon_env_builder.init_start( initial_tenant_conf={ @@ -844,7 +837,6 @@ def test_timeline_delete_resumed_on_attach( ): neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_deleted_tenant_ignored_on_attach", ) env = neon_env_builder.init_start(initial_tenant_conf=MANY_SMALL_LAYERS_TENANT_CONFIG) diff --git a/test_runner/regress/test_timeline_size.py b/test_runner/regress/test_timeline_size.py index f6e4a667a4..d754ce0aa0 100644 --- a/test_runner/regress/test_timeline_size.py +++ b/test_runner/regress/test_timeline_size.py @@ -306,9 +306,7 @@ def test_timeline_physical_size_init( neon_env_builder: NeonEnvBuilder, remote_storage_kind: Optional[RemoteStorageKind] ): if remote_storage_kind is not None: - neon_env_builder.enable_remote_storage( - remote_storage_kind, "test_timeline_physical_size_init" - ) + neon_env_builder.enable_remote_storage(remote_storage_kind) env = neon_env_builder.init_start() @@ -349,9 +347,7 @@ def test_timeline_physical_size_post_checkpoint( neon_env_builder: NeonEnvBuilder, remote_storage_kind: Optional[RemoteStorageKind] ): if remote_storage_kind is not None: - neon_env_builder.enable_remote_storage( - remote_storage_kind, "test_timeline_physical_size_init" - ) + neon_env_builder.enable_remote_storage(remote_storage_kind) env = neon_env_builder.init_start() @@ -382,9 +378,7 @@ def test_timeline_physical_size_post_compaction( neon_env_builder: NeonEnvBuilder, remote_storage_kind: Optional[RemoteStorageKind] ): if remote_storage_kind is not None: - neon_env_builder.enable_remote_storage( - remote_storage_kind, "test_timeline_physical_size_init" - ) + neon_env_builder.enable_remote_storage(remote_storage_kind) # Disable background compaction as we don't want it to happen after `get_physical_size` request # and before checking the expected size on disk, which makes the assertion failed @@ -437,9 +431,7 @@ def test_timeline_physical_size_post_gc( neon_env_builder: NeonEnvBuilder, remote_storage_kind: Optional[RemoteStorageKind] ): if remote_storage_kind is not None: - neon_env_builder.enable_remote_storage( - remote_storage_kind, "test_timeline_physical_size_init" - ) + neon_env_builder.enable_remote_storage(remote_storage_kind) # Disable background compaction and GC as we don't want it to happen after `get_physical_size` request # and before checking the expected size on disk, which makes the assertion failed @@ -572,9 +564,7 @@ def test_tenant_physical_size( random.seed(100) if remote_storage_kind is not None: - neon_env_builder.enable_remote_storage( - remote_storage_kind, "test_timeline_physical_size_init" - ) + neon_env_builder.enable_remote_storage(remote_storage_kind) env = neon_env_builder.init_start() diff --git a/test_runner/regress/test_wal_acceptor.py b/test_runner/regress/test_wal_acceptor.py index 8ca93845b2..119a597d43 100644 --- a/test_runner/regress/test_wal_acceptor.py +++ b/test_runner/regress/test_wal_acceptor.py @@ -439,7 +439,6 @@ def test_wal_backup(neon_env_builder: NeonEnvBuilder, remote_storage_kind: Remot neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_safekeepers_wal_backup", ) neon_env_builder.remote_storage_users = RemoteStorageUsers.SAFEKEEPER @@ -491,7 +490,6 @@ def test_s3_wal_replay(neon_env_builder: NeonEnvBuilder, remote_storage_kind: Re neon_env_builder.enable_remote_storage( remote_storage_kind=remote_storage_kind, - test_name="test_s3_wal_replay", ) neon_env_builder.remote_storage_users = RemoteStorageUsers.SAFEKEEPER