mirror of
https://github.com/scylladb/scylladb.git
synced 2026-04-26 19:35:12 +00:00
9dca7719b1
Switch off C++ tests from test.py discovery. With this change, test.py loses the ability to directly see and run the C++ tests. Instead, it'll delegate all things to the pytest. Since boost, raft, unit, and ldap directories aren't executed by test.py, suite.yaml files are renamed to test_config.yaml to preserve the old way of test configuration and removing them from execution by test.py Before this patch boost test were visible by test.py and pytest. So if the test.py will be invoked without test name, it will execute boost tests twice: with test.py executor and with pytest executor. Depending on the test name according executor will be used. For example, if test name is test/boost/aggregate_fcts_test.cc it will be executed by pytest, but if the boost/aggregate_fcts_test it will be executed by test.py executor.
124 lines
5.2 KiB
Python
124 lines
5.2 KiB
Python
#
|
|
# Copyright (C) 2025-present ScyllaDB
|
|
#
|
|
# SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
|
|
#
|
|
import os
|
|
from copy import copy
|
|
from pathlib import Path, PosixPath
|
|
|
|
import yaml
|
|
from pytest import Collector
|
|
|
|
from test import ALL_MODES, DEBUG_MODES
|
|
from test.pylib.cpp.facade import CppTestFacade
|
|
from test.pylib.cpp.item import CppFile, coverage
|
|
from test.pylib.util import get_modes_to_run
|
|
|
|
|
|
TEST_CONFIG = 'test_config.yaml'
|
|
DEFAULT_ARGS = [
|
|
'--overprovisioned',
|
|
'--unsafe-bypass-fsync 1',
|
|
'--kernel-page-cache 1',
|
|
'--blocked-reactor-notify-ms 2000000',
|
|
'--collectd 0',
|
|
'--max-networking-io-control-blocks=100',
|
|
]
|
|
UBSAN_OPTIONS = [
|
|
"halt_on_error=1",
|
|
"abort_on_error=1",
|
|
f"suppressions={os.getcwd()}/ubsan-suppressions.supp",
|
|
os.getenv("UBSAN_OPTIONS"),
|
|
]
|
|
ASAN_OPTIONS = [
|
|
"disable_coredump=0",
|
|
"abort_on_error=1",
|
|
"detect_stack_use_after_return=1",
|
|
os.getenv("ASAN_OPTIONS"),
|
|
]
|
|
|
|
|
|
def get_disabled_tests(config: dict, modes: list[str]) -> dict[str, set[str]]:
|
|
"""
|
|
Get the dict with disabled tests.
|
|
Pytest spawns one process, so all modes should be handled there instead one by one as test.py does.
|
|
"""
|
|
disabled_tests = {}
|
|
for mode in modes:
|
|
# Skip tests disabled in suite.yaml
|
|
disabled_tests_for_mode = set(config.get('disable', []))
|
|
# Skip tests disabled in the specific mode.
|
|
disabled_tests_for_mode.update(config.get('skip_in_' + mode, []))
|
|
# If this mode is one of the debug modes, and there are
|
|
# tests disabled in a debug mode, add these tests to the skip list.
|
|
if mode in DEBUG_MODES:
|
|
disabled_tests_for_mode.update(config.get('skip_in_debug_modes', []))
|
|
# If a test is listed in run_in_<mode>, it should only be enabled in
|
|
# this mode. Tests not listed in any run_in_<mode> directive should
|
|
# run in all modes. Inverting this, we should disable all tests
|
|
# that are listed explicitly in some run_in_<m> where m != mode
|
|
# This, of course, may create ambiguity with skip_* settings,
|
|
# since the priority of the two is undefined, but oh well.
|
|
run_in_m = set(config.get('run_in_' + mode, []))
|
|
for a in ALL_MODES:
|
|
if a == mode:
|
|
continue
|
|
skip_in_m = set(config.get('run_in_' + a, []))
|
|
disabled_tests_for_mode.update(skip_in_m - run_in_m)
|
|
disabled_tests[mode] = disabled_tests_for_mode
|
|
return disabled_tests
|
|
|
|
|
|
def read_suite_config(directory: Path) -> dict[str, str]:
|
|
"""
|
|
Helper method that returns the configuration from the test_config.yaml file.
|
|
It can be that there's no test_config.yaml that means there are no additional parameters for Scylla itself or no
|
|
filtering on what modes tests should be executed or skipped
|
|
"""
|
|
config = directory / TEST_CONFIG
|
|
if config.exists() and config.stat().st_size:
|
|
cfg = yaml.safe_load(config.read_text(encoding='utf-8'))
|
|
if not isinstance(cfg, dict):
|
|
raise ValueError(f"Invalid {TEST_CONFIG} format in {directory}. Expected a dictionary, got {type(cfg)}")
|
|
return cfg
|
|
else:
|
|
return {}
|
|
|
|
|
|
def collect_items(file_path: PosixPath, parent: Collector, facade: CppTestFacade) -> object:
|
|
"""
|
|
Collect c++ test based on the .cc files. C++ test binaries are located in different directory, so the method will take care
|
|
to provide the correct path to the binary based on the file name and mode.
|
|
"""
|
|
test_env = dict(
|
|
UBSAN_OPTIONS=":".join(filter(None, UBSAN_OPTIONS)),
|
|
ASAN_OPTIONS=":".join(filter(None, ASAN_OPTIONS)),
|
|
SCYLLA_TEST_ENV='yes',
|
|
)
|
|
pytest_config = parent.config
|
|
run_id = pytest_config.getoption('run_id')
|
|
modes = get_modes_to_run(parent.session.config)
|
|
suite_config = read_suite_config(file_path.parent)
|
|
no_parallel_cases = suite_config.get('no_parallel_cases', [])
|
|
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
|
|
coverage_config = coverage(pytest_config.getoption('coverage'), suite_config.get('coverage', True),
|
|
pytest_config.getoption('coverage_modes'))
|
|
|
|
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,
|
|
run_id=run_id, facade=facade, env=test_env, coverage_config=coverage_config)
|
|
else:
|
|
args.extend(custom_args)
|
|
return CppFile.from_parent(parent=parent, path=file_path, arguments=args, no_parallel_run=no_parallel_run,
|
|
modes=modes, disabled_tests=disabled_tests, run_id=run_id, facade=facade,
|
|
env=test_env, coverage_config=coverage_config)
|