Disable test file inference when testFileHeuristic is disabled

Author: guillaume-dequenne

src/pysonar_scanner/configuration/configuration_loader.py

@@ -73,10 +73,11 @@ def load() -> dict[Key, Any]:
         resolved_properties.update(environment_variables.load())
         resolved_properties.update(cli_properties)
 
-        # Auto-detect sonar.tests only when the user has not set it in any higher-priority source.
-        # Running python_project_loader unconditionally would emit confusing warnings about
-        # pytest config even when the result would be discarded.
-        if SONAR_TESTS not in resolved_properties:
+        # Auto-detect sonar.tests only when the user has not set it in any higher-priority source
+        # and has not explicitly disabled the sonar-python test file heuristic. When the heuristic
+        # is disabled the intent is to analyse all files as main code with no test classification.
+        heuristic_disabled = resolved_properties.get("sonar.python.testFileHeuristic.disabled", "").lower() == "true"
+        if SONAR_TESTS not in resolved_properties and not heuristic_disabled:
             resolved_properties.update(test_paths_loader.load(base_dir))
 
         return resolved_properties

tests/unit/test_configuration_loader.py

@@ -478,9 +478,7 @@ def test_env_var_sonar_tests_overrides_auto_detection(self, mock_get_os, mock_ge
 
     @patch("sys.argv", ["myscript.py"])
     @patch("pysonar_scanner.configuration.configuration_loader.test_paths_loader")
-    def test_test_paths_loader_not_called_when_sonar_tests_already_set(
-        self, mock_loader, mock_get_os, mock_get_arch
-    ):
+    def test_test_paths_loader_not_called_when_sonar_tests_already_set(self, mock_loader, mock_get_os, mock_get_arch):
         """test_paths_loader must not run at all when sonar.tests is already set — avoids spurious warnings."""
         self.fs.create_file(
             "sonar-project.properties",
@@ -489,6 +487,18 @@ def test_test_paths_loader_not_called_when_sonar_tests_already_set(
         ConfigurationLoader.load()
         mock_loader.load.assert_not_called()
 
+    @patch("sys.argv", ["myscript.py"])
+    @patch("pysonar_scanner.configuration.configuration_loader.test_paths_loader")
+    def test_test_paths_loader_not_called_when_heuristic_disabled(self, mock_loader, mock_get_os, mock_get_arch):
+        """test_paths_loader must not run when sonar.python.testFileHeuristic.disabled=true."""
+        self.fs.create_file(
+            "sonar-project.properties",
+            contents="sonar.python.testFileHeuristic.disabled=true\n",
+        )
+        self.fs.create_dir("tests")  # inference would find this if it ran
+        ConfigurationLoader.load()
+        mock_loader.load.assert_not_called()
+
     @patch("sys.argv", ["myscript.py"])
     @patch.dict("os.environ", {"SONAR_TOKEN": "TokenFromEnv", "SONAR_PROJECT_KEY": "KeyFromEnv"}, clear=True)
     def test_load_from_env_variables_only(self, mock_get_os, mock_get_arch):

tests/unit/test_test_paths_loader.py

@@ -132,12 +132,7 @@ def test_load_from_pytest_ini(self):
     def test_load_from_pytest_ini_multiline(self):
         self.fs.create_file(
             "pytest.ini",
-            contents=(
-                "[pytest]\n"
-                "testpaths =\n"
-                "    tests\n"
-                "    integration\n"
-            ),
+            contents=("[pytest]\n" "testpaths =\n" "    tests\n" "    integration\n"),
         )
         self.fs.create_dir("tests")
         self.fs.create_dir("integration")
@@ -185,12 +180,7 @@ def test_load_from_tox_ini_multiple_paths(self):
     def test_load_from_tox_ini_multiline(self):
         self.fs.create_file(
             "tox.ini",
-            contents=(
-                "[pytest]\n"
-                "testpaths =\n"
-                "    tests\n"
-                "    integration\n"
-            ),
+            contents=("[pytest]\n" "testpaths =\n" "    tests\n" "    integration\n"),
         )
         self.fs.create_dir("tests")
         self.fs.create_dir("integration")