Fix: restore code coverage

.github/workflows/python-ci.yml

@@ -138,7 +138,7 @@ jobs:
           -Dsonar.organization=vitruviansoftware
           -Dsonar.python.coverage.reportPaths=coverage.xml
           -Dsonar.sources=src/cli_code
-          -Dsonar.tests=test_dir
+          -Dsonar.tests=tests
           -Dsonar.sourceEncoding=UTF-8
           -Dsonar.scm.provider=git
           -Dsonar.coverage.jacoco.xmlReportPaths=coverage.xml

conftest.py

@@ -12,22 +12,10 @@
 except ImportError:
     PYTEST_AVAILABLE = False
 
-def pytest_ignore_collect(path):
-    """
-    Determine which test files to ignore during collection.
-
-    Args:
-        path: Path object representing a test file or directory
-
-    Returns:
-        bool: True if the file should be ignored, False otherwise
-    """
-    # Check if we're running in CI
-    in_ci = os.environ.get('CI', 'false').lower() == 'true'
-
-    if in_ci:
-        # Skip comprehensive test files in CI environments
-        if '_comprehensive' in str(path):
-            return True
-
-    return False 
+def pytest_ignore_collect(path, config):
+    """Ignore tests containing '_comprehensive' in their path when CI=true."""
+    # if os.environ.get("CI") == "true" and "_comprehensive" in str(path):
+    #     print(f"Ignoring comprehensive test in CI: {path}")
+    #     return True
+    # return False
+    pass # Keep the function valid syntax, but effectively do nothing.

pytest.ini

@@ -8,7 +8,7 @@ markers =
     requires_openai: marks tests that require openai module
     timeout: marks tests with a timeout
 pythonpath = src
-testpaths = tests test_dir
+testpaths = tests
 python_files = test_*.py
 python_classes = Test*
 python_functions = test_*

sonar-project.properties

@@ -9,7 +9,7 @@ sonar.projectVersion=0.2.1
 
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
 sonar.sources=src/cli_code
-sonar.tests=test_dir
+sonar.tests=tests
 
 # Coverage report paths
 sonar.python.coverage.reportPaths=coverage.xml