mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-27 03:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

test.py: switch off C++ tests from test.py discovery

Browse Source 
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.
This commit is contained in:
Andrei Chekun
2025-04-09 13:43:34 +02:00
parent 42d9dbe66a
commit 9dca7719b1
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/pylib/cpp/common_cpp_conftest.py
View File

@@ -16,6 +16,7 @@ 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',
@@ -71,13 +72,18 @@ def get_disabled_tests(config: dict, modes: list[str]) -> dict[str, set[str]]:
def read_suite_config(directory: Path) -> dict[str, str]:
"""
Helper method that will return the configuration from the suite.yaml file
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
"""
with open(directory / 'suite.yaml', 'r') as cfg_file:
cfg = yaml.safe_load(cfg_file.read())
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 RuntimeError('Failed to load tests: suite.yaml is empty')
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: