fix unittest failures after adding _config_hash

Signed-off-by: Songmin Li <lisongmin@protonmail.com>

Author: lisongmin

podman_compose.py

@@ -2139,13 +2139,18 @@ def config_hash(self, service: dict[str, Any]) -> str:
             return service["_config_hash"]
 
         # Use a stable representation of the service configuration
-        jsonable_servcie = {
-            k: v for k, v in service.items() if isinstance(k, str) and not k.startswith("_")
-        }
+        jsonable_servcie = self.original_service(service)
         config_str = json.dumps(jsonable_servcie, sort_keys=True)
         service["_config_hash"] = hashlib.sha256(config_str.encode('utf-8')).hexdigest()
         return service["_config_hash"]
 
+    def original_service(self, service: dict[str, Any]) -> dict[str, Any]:
+        """
+        Returns the original service configuration without any overrides or resets.
+        This is used to compare the original service configuration with the current one.
+        """
+        return {k: v for k, v in service.items() if isinstance(k, str) and not k.startswith("_")}
+
     def resolve_pod_name(self) -> str | None:
         # Priorities:
         # - Command line --in-pod

tests/unit/test_can_merge_build.py

@@ -92,8 +92,9 @@ def test_parse_compose_file_when_multiple_composes(self, input, override, expect
 
         actual_compose = {}
         if podman_compose.services:
-            podman_compose.services["test-service"].pop("_deps")
-            actual_compose = podman_compose.services["test-service"]
+            actual_compose = podman_compose.original_service(
+                podman_compose.services["test-service"]
+            )
         self.assertEqual(actual_compose, expected)
 
     # $$$ is a placeholder for either command or entrypoint
@@ -138,8 +139,7 @@ def test_parse_compose_file_when_multiple_composes_keys_command_entrypoint(
 
             actual = {}
             if podman_compose.services:
-                podman_compose.services["test-service"].pop("_deps")
-                actual = podman_compose.services["test-service"]
+                actual = podman_compose.original_service(podman_compose.services["test-service"])
             self.assertEqual(actual, expected)
 
 

tests/unit/test_normalize_final_build.py

@@ -123,8 +123,9 @@ def test_parse_compose_file_when_single_compose(self, input, expected):
 
         actual_compose = {}
         if podman_compose.services:
-            podman_compose.services["test-service"].pop("_deps")
-            actual_compose = podman_compose.services["test-service"]
+            actual_compose = podman_compose.original_service(
+                podman_compose.services["test-service"]
+            )
         self.assertEqual(actual_compose, expected)
 
     @parameterized.expand([
@@ -238,8 +239,9 @@ def test_parse_when_multiple_composes(self, input, override, expected):
 
         actual_compose = {}
         if podman_compose.services:
-            podman_compose.services["test-service"].pop("_deps")
-            actual_compose = podman_compose.services["test-service"]
+            actual_compose = podman_compose.original_service(
+                podman_compose.services["test-service"]
+            )
         self.assertEqual(actual_compose, expected)