SONARPY-4013 Fix checksum check (#1039)

GitOrigin-RevId: 6eb699c1de899e546cae5416f7e5bbb13970f9fb

Author: Seppli11

python-frontend/typeshed_serializer/README.md

@@ -32,8 +32,8 @@ tox -e py39 -- tests/runners/test_tox_runner.py::ToxRunnerTest::test_dry_run_unc
 python runners/tox_runner.py --dry_run true 
 ```
 
-Can also be run in fail fast mode, to reflect behaviour in CI (where failStubGenerationFast is true)
+Can also be run in fail fast mode, to reflect the checksum validation used by the QA workflow
 
 ```bash
 python runners/tox_runner.py --dry_run true --fail_fast true  
-```
+```

python-frontend/typeshed_serializer/checksums/custom.checksum

@@ -1,2 +1,2 @@
-61e014719cf03716e393ae97da9e3d394f41cc9f4bf4f5ee9fe48b2004605cfd
-f8586ea766acbd86c5c0995ce3a7cc068ce433673cf057457eb8188fadc9ff39
+669032ff87c6a7027931d1987597a4371fc80b9da0f7817762518ec75d1fa357
+8a2fb0e2abba9b8e562913a29440ec31c7fd322f0c31d2d64d9a6c9591b444ed

python-frontend/typeshed_serializer/runners/tox_runner.py

@@ -216,9 +216,9 @@ def detect_required_serializations(fail_fast=False) -> List[str]:
         binary_changed = compute_and_compare_checksums("BINARY", folder_name, binary_files, read_file, previous_binary_checksum)
 
         if ressources_changed or binary_changed:
-            # Check for binary inconsistency (binary changed but source didn't)
-            if binary_changed and not ressources_changed and fail_fast:
-                raise RuntimeError('INCONSISTENT RESOURCE FOLDER BINARY CHECKSUMS')
+            # In CI fail-fast mode, the committed checksums must already match the tracked tree.
+            if fail_fast:
+                raise RuntimeError('INCONSISTENT RESOURCE FOLDER CHECKSUMS')
             ressources_that_needs_serialization.append(folder_config['serializer'])
 
     return ressources_that_needs_serialization

python-frontend/typeshed_serializer/tests/runners/test_tox_runner.py

@@ -617,7 +617,91 @@ def test_detect_required_serializations_fail_fast_binary_inconsistent(self):
                 tox_runner.detect_required_serializations(fail_fast=True)
 
             self.assertEqual(
-                str(error.exception), "INCONSISTENT RESOURCE FOLDER BINARY CHECKSUMS"
+                str(error.exception), "INCONSISTENT RESOURCE FOLDER CHECKSUMS"
+            )
+
+    def test_detect_required_serializations_fail_fast_source_inconsistent(self):
+        mock_resources_folders = {
+            "custom": {
+                "serializer": "custom",
+                "source_path": "custom",
+            }
+        }
+
+        with (
+            mock.patch(
+                f"{self.MODULE_NAME}.RESOURCES_FOLDERS",
+                mock_resources_folders,
+            ),
+            mock.patch(
+                f"{self.MODULE_NAME}.fetch_resources_subfolder_files"
+            ) as mock_resources_files,
+            mock.patch(self.COMPUTE_CHECKSUM_FUNCTION) as mocked_checksum,
+            mock.patch(
+                f"{self.MODULE_NAME}.fetch_binary_files_for_folder"
+            ) as mock_binary_files,
+            mock.patch(
+                f"{self.MODULE_NAME}.read_previous_folder_checksum"
+            ) as mock_read_checksum,
+        ):
+            mock_resources_files.return_value = [os.path.join("custom", "test.pyi")]
+            mock_binary_files.return_value = [os.path.join("custom_protobuf", "test.protobuf")]
+            mocked_checksum.side_effect = [
+                "456",
+                "123",
+            ]
+            mock_read_checksum.return_value = (
+                "999",
+                "123",
+            )
+
+            with self.assertRaises(RuntimeError) as error:
+                tox_runner.detect_required_serializations(fail_fast=True)
+
+            self.assertEqual(
+                str(error.exception), "INCONSISTENT RESOURCE FOLDER CHECKSUMS"
+            )
+
+    def test_detect_required_serializations_fail_fast_source_and_binary_inconsistent(self):
+        mock_resources_folders = {
+            "custom": {
+                "serializer": "custom",
+                "source_path": "custom",
+            }
+        }
+
+        with (
+            mock.patch(
+                f"{self.MODULE_NAME}.RESOURCES_FOLDERS",
+                mock_resources_folders,
+            ),
+            mock.patch(
+                f"{self.MODULE_NAME}.fetch_resources_subfolder_files"
+            ) as mock_resources_files,
+            mock.patch(self.COMPUTE_CHECKSUM_FUNCTION) as mocked_checksum,
+            mock.patch(
+                f"{self.MODULE_NAME}.fetch_binary_files_for_folder"
+            ) as mock_binary_files,
+            mock.patch(
+                f"{self.MODULE_NAME}.read_previous_folder_checksum"
+            ) as mock_read_checksum,
+        ):
+            mock_resources_files.return_value = [os.path.join("custom", "test.pyi")]
+            mock_binary_files.return_value = [os.path.join("custom_protobuf", "test.protobuf")]
+            mocked_checksum.side_effect = [
+                "456",
+                "789",
+            ]
+            mock_read_checksum.return_value = (
+                "999",
+                "123",
+            )
+
+            with self.assertRaises(RuntimeError) as error:
+                tox_runner.detect_required_serializations(fail_fast=True)
+
+            self.assertEqual(
+                str(error.exception), "INCONSISTENT RESOURCE FOLDER CHECKSUMS"
             )
 
     def test_detect_required_serializations_no_fail_fast_binary_inconsistent(self):
@@ -665,8 +749,46 @@ def test_detect_required_serializations_no_fail_fast_binary_inconsistent(self):
             result = tox_runner.detect_required_serializations(fail_fast=False)
             self.assertEqual(result, ["custom"])
 
-    def test_main_fail_fast_resource_folder_binary_inconsistent(self):
-        # Test main function fail-fast when resource folder has binary inconsistency
+    def test_detect_required_serializations_no_fail_fast_source_and_binary_inconsistent(self):
+        mock_resources_folders = {
+            "custom": {
+                "serializer": "custom",
+                "source_path": "custom",
+            }
+        }
+
+        with (
+            mock.patch(
+                f"{self.MODULE_NAME}.RESOURCES_FOLDERS",
+                mock_resources_folders,
+            ),
+            mock.patch(
+                f"{self.MODULE_NAME}.fetch_resources_subfolder_files"
+            ) as mock_resources_files,
+            mock.patch(self.COMPUTE_CHECKSUM_FUNCTION) as mocked_checksum,
+            mock.patch(
+                f"{self.MODULE_NAME}.fetch_binary_files_for_folder"
+            ) as mock_binary_files,
+            mock.patch(
+                f"{self.MODULE_NAME}.read_previous_folder_checksum"
+            ) as mock_read_checksum,
+        ):
+            mock_resources_files.return_value = [os.path.join("custom", "test.pyi")]
+            mock_binary_files.return_value = [os.path.join("custom_protobuf", "test.protobuf")]
+            mocked_checksum.side_effect = [
+                "456",
+                "789",
+            ]
+            mock_read_checksum.return_value = (
+                "999",
+                "123",
+            )
+
+            result = tox_runner.detect_required_serializations(fail_fast=False)
+            self.assertEqual(result, ["custom"])
+
+    def test_main_fail_fast_resource_folder_checksum_inconsistent(self):
+        # Test main function fail-fast when resource folder checksums are inconsistent
         source_checksum = "123"
 
         with (
@@ -687,15 +809,15 @@ def test_main_fail_fast_resource_folder_binary_inconsistent(self):
 
             # Resource folder check raises RuntimeError
             mock_check_changes.side_effect = RuntimeError(
-                "INCONSISTENT RESOURCE FOLDER BINARY CHECKSUMS"
+                "INCONSISTENT RESOURCE FOLDER CHECKSUMS"
             )
 
             # Should propagate the RuntimeError
             with self.assertRaises(RuntimeError) as error:
                 tox_runner.main(fail_fast=True)
 
             self.assertEqual(
-                str(error.exception), "INCONSISTENT RESOURCE FOLDER BINARY CHECKSUMS"
+                str(error.exception), "INCONSISTENT RESOURCE FOLDER CHECKSUMS"
             )
             # Should not call subprocess
             mocked_subprocess.run.assert_not_called()
@@ -891,4 +1013,3 @@ def test_compute_and_compare_checksums_unchanged(self):
 
             self.assertFalse(result)
             mock_logger.info.assert_any_call('BINARY FILES UNCHANGED in folder: importer - Computed over 2 files - Checksum: same_checksum')
-