Review suggestions

Author: davidrudlstorfer

.github/actions/run_tests/action.yml

@@ -46,7 +46,5 @@ runs:
         pip list
         cd tests
         coverage run --rcfile=${{ inputs.coverage_config }} testing_main.py
-        coverage html
-        coverage report
-        coverage-badge -o htmlcov/coverage.svg
+        cd ..
         pytest

pyproject.toml

@@ -60,7 +60,8 @@ CI-CD = [
 [tool.pytest.ini_options]
 addopts = "-p pytest_cov --cov-report=term --cov-report=html --cov-fail-under=30 --cov=meshpy/ --cov=tutorial/ --cov-append"
 markers = [
-  "fourc_arborx: tests in combination with 4C and ArborX",
+  "fourc: tests in combination with 4C",
+  "arborx: tests in combination with ArborX",
   "cubitpy: tests in combination with CubitPy",
   "performance: performance tests of MeshPy"
 ]

tests/conftest.py

@@ -46,35 +46,51 @@ def pytest_addoption(parser: Parser) -> None:
     """
 
     parser.addoption(
-        "--4C_ArborX",
+        "--4C",
         action="store_true",
         default=False,
-        help="Execute 4C and ArborX based tests.",
+        help="Execute standard and 4C based tests.",
+    )
+
+    parser.addoption(
+        "--ArborX",
+        action="store_true",
+        default=False,
+        help="Execute standard and ArborX based tests.",
     )
 
     parser.addoption(
         "--CubitPy",
         action="store_true",
         default=False,
-        help="Execute CubitPy based tests.",
+        help="Execute standard and CubitPy based tests.",
+    )
+
+    parser.addoption(
+        "--Performance",
+        action="store_true",
+        default=False,
+        help="Execute standard and performance tests.",
     )
 
     parser.addoption(
-        "--performance",
+        "--exclude-standard-tests",
         action="store_true",
         default=False,
-        help="Execute performance tests.",
+        help="Exclude standard tests.",
     )
 
 
 def pytest_collection_modifyitems(config: Config, items: list) -> None:
     """Filter tests based on their markers and provided command line options.
 
     Currently configured options:
-        `pytest`: execute tests with no markers
-        `pytest --4C_ArborX`: execute tests with the `fourc_arborx` marker
-        `pytest --CubitPy`: execute tests with the `cubitpy` marker
-        `pytest --performance`: execute tests with the `performance` marker
+        `pytest`: Execute standard tests with no markers
+        `pytest --4C`: Execute standard tests and tests with the `fourc` marker
+        `pytest --ArborX`: Execute standard tests and tests with the `arborx` marker
+        `pytest --CubitPy`: Execute standard tests and tests with the `cubitpy` marker
+        `pytest --Performance`: Execute standard tests and tests with the `performance` marker
+        `pytest --exclude-standard-tests`: Execute tests with any other marker and exclude the standard unmarked tests
 
     Args:
         config: Pytest config
@@ -88,16 +104,19 @@ def pytest_collection_modifyitems(config: Config, items: list) -> None:
         # Get all set markers for current test (e.g. `fourc_arborx`, `cubitpy`, `performance`)
         markers = [marker.name for marker in item.iter_markers()]
 
-        if config.getoption("--4C_ArborX") and "fourc_arborx" in markers:
+        if config.getoption("--4C") and "fourc" in markers:
+            selected_tests.append(item)
+
+        if config.getoption("--ArborX") and "arborx" in markers:
             selected_tests.append(item)
 
         if config.getoption("--CubitPy") and "cubitpy" in markers:
             selected_tests.append(item)
 
-        if config.getoption("--performance") and "performance" in markers:
+        if config.getoption("--Performance") and "performance" in markers:
             selected_tests.append(item)
 
-        if not markers:
+        if not markers and not config.getoption("--exclude-standard-tests"):
             selected_tests.append(item)
 
     deselected_tests = list(set(items) - set(selected_tests))
@@ -133,5 +152,5 @@ def current_test_name(request: pytest.FixtureRequest) -> str:
 
 
 @pytest.fixture
-def compare_result_file(reference, result, rtol, atol):
+def compare_results(reference, result, rtol, atol):
     raise NotImplementedError

tests/test_dummy.py

@@ -35,7 +35,9 @@
 import pytest
 
 
-def test_dummy(reference_file_directory: Path, tmp_path: Path, current_test_name: str):
+def test_dummy(
+    reference_file_directory: Path, tmp_path: Path, current_test_name: str
+) -> None:
     """Dummy test to demonstrate pytest fixtures.
 
     Args:
@@ -58,9 +60,16 @@ def test_dummy(reference_file_directory: Path, tmp_path: Path, current_test_name
     assert True
 
 
-@pytest.mark.fourc_arborx
-def test_4C_ArborX() -> None:
-    """Test with 4C and ArborX."""
+@pytest.mark.fourc
+def test_4C() -> None:
+    """Test with 4C."""
+
+    assert True
+
+
+@pytest.mark.arborx
+def test_ArborX() -> None:
+    """Test with ArborX."""
 
     assert True