From 29a2524788c66c8ef640f17ddcac54571dcbef81 Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Mon, 10 Jun 2024 11:30:19 +0100 Subject: [PATCH] A little cleanup --- test_runner/fixtures/neon_fixtures.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py index 90ecd30151..a70f4228e4 100644 --- a/test_runner/fixtures/neon_fixtures.py +++ b/test_runner/fixtures/neon_fixtures.py @@ -1355,7 +1355,7 @@ def _shared_simple_env( pg_distrib_dir=pg_distrib_dir, pg_version=pg_version, run_id=run_id, - preserve_database_files=pytestconfig.getoption("--preserve-database-files"), + preserve_database_files=cast(bool, pytestconfig.getoption("--preserve-database-files")), test_name=request.node.name, test_output_dir=test_output_dir, pageserver_virtual_file_io_engine=pageserver_virtual_file_io_engine, @@ -1430,7 +1430,7 @@ def neon_env_builder( pg_version=pg_version, broker=default_broker, run_id=run_id, - preserve_database_files=pytestconfig.getoption("--preserve-database-files"), + preserve_database_files=cast(bool, pytestconfig.getoption("--preserve-database-files")), pageserver_virtual_file_io_engine=pageserver_virtual_file_io_engine, test_name=request.node.name, test_output_dir=test_output_dir, @@ -1439,10 +1439,11 @@ def neon_env_builder( pageserver_default_tenant_config_compaction_algorithm=pageserver_default_tenant_config_compaction_algorithm, ) as builder: yield builder - if builder.preserve_database_files: - # Propogate `preserve_database_files` to make it possible to use in other fixtures, - # like `test_output_dir` fixture for attaching all database files to Allure report. - request.node.user_properties.append(("preserve_database_files", True)) + # Propogate `preserve_database_files` to make it possible to use in other fixtures, + # like `test_output_dir` fixture for attaching all database files to Allure report. + request.node.user_properties.append( + ("preserve_database_files", builder.preserve_database_files) + ) @dataclass