From 22ef09489db5adb5fcaa69bf3c720bc91b489cb7 Mon Sep 17 00:00:00 2001 From: Andrei Chekun Date: Fri, 18 Apr 2025 17:27:03 +0200 Subject: [PATCH] test.py: add awareness of extra_scylla_cmdline_options test_config.yaml can have field extra_scylla_cmdline_options that previously was not added to the commandline to start Scylla. Now any extra options will be added to commandline to start tests --- test/pylib/cpp/common_cpp_conftest.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/pylib/cpp/common_cpp_conftest.py b/test/pylib/cpp/common_cpp_conftest.py index fa57720d7a..5ad3317a39 100644 --- a/test/pylib/cpp/common_cpp_conftest.py +++ b/test/pylib/cpp/common_cpp_conftest.py @@ -97,10 +97,12 @@ def collect_items(file_path: PosixPath, parent: Collector, facade: CppTestFacade disabled_tests = get_disabled_tests(suite_config, modes) args = copy(DEFAULT_ARGS) custom_args_config = suite_config.get('custom_args', {}) + extra_scylla_cmdline_options = suite_config.get('extra_scylla_cmdline_options', []) test_name = file_path.stem no_parallel_run = True if test_name in no_parallel_cases else False custom_args = custom_args_config.get(file_path.stem, ['-c2 -m2G']) + args.extend(extra_scylla_cmdline_options) if len(custom_args) > 1: return CppFile.from_parent(parent=parent, path=file_path, arguments=args, parameters=custom_args, no_parallel_run=no_parallel_run, modes=modes, disabled_tests=disabled_tests,