From dc38cd4d6ccadd48caad5cc0d1c26a65f16fed0c Mon Sep 17 00:00:00 2001 From: Philipp Wullstein-Kammler Date: Mon, 10 Feb 2025 16:14:01 +0100 Subject: [PATCH] Compute coverage of all files Include all files from the `lobster` folder when computing the coverage. This implies three changes: - set `--source=lobster` when running unit tests - set `--source=` when running system tests - remove the `omit` section from the coverage computation file - reduce the `--fail-under` parameter --- Makefile | 3 ++- coverage.cfg | 6 ------ tests-system/run_tool_tests.py | 8 +++----- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 0b8b34ae..556e0e19 100644 --- a/Makefile +++ b/Makefile @@ -76,6 +76,7 @@ unit-tests: coverage run -p \ --branch --rcfile=coverage.cfg \ --data-file .coverage \ + --source=lobster \ -m unittest discover -s tests-unit -v upload-main: packages @@ -102,7 +103,7 @@ full-release: coverage: coverage combine -q coverage html --rcfile=coverage.cfg - coverage report --rcfile=coverage.cfg --fail-under=58 + coverage report --rcfile=coverage.cfg --fail-under=53 test: clean-coverage system-tests unit-tests make coverage diff --git a/coverage.cfg b/coverage.cfg index b6872154..75bd0007 100644 --- a/coverage.cfg +++ b/coverage.cfg @@ -8,9 +8,3 @@ exclude_lines = def __repr__(self) def sanity_test() if __name__ == "__main__" - -[run] -omit = - /usr/* - */site-packages/* - tests-unit/* diff --git a/tests-system/run_tool_tests.py b/tests-system/run_tool_tests.py index ea7ff7ed..899d8e61 100644 --- a/tests-system/run_tool_tests.py +++ b/tests-system/run_tool_tests.py @@ -136,14 +136,12 @@ def _run_test(setup: TestSetup, tool: str) -> CompletedProcess: print(f"Starting system test '{setup.name}' with arguments {setup.args} " \ f"for tool '{tool}' with coverage.") root_directory = Path(__file__).resolve().parents[1] - coverage_config_path = root_directory / "coverage.cfg" - coverage_data_path = root_directory / ".coverage" - coverage_command = [ "coverage", "run", "-p", - f"--rcfile={coverage_config_path}", + f"--rcfile={root_directory / 'coverage.cfg'}", "--branch", - f"--data-file={coverage_data_path}", + f"--data-file={root_directory / '.coverage'}", + f"--source={root_directory / 'lobster'}", tool, *setup.args ]