fix: match

Author: giancarloromeo

packages/common-library/src/common_library/dict_tools.py

@@ -58,3 +58,15 @@ def update_dict(obj: dict, **updates):
             {key: update_value(obj[key]) if callable(update_value) else update_value}
         )
     return obj
+
+
+def assert_equal_ignoring_none(expected: dict, actual: dict):
+    for key, exp_value in expected.items():
+        if exp_value is None:
+            continue
+        assert key in actual, f"Missing key {key}"
+        act_value = actual[key]
+        if isinstance(exp_value, dict) and isinstance(act_value, dict):
+            assert_equal_ignoring_none(exp_value, act_value)
+        else:
+            assert act_value == exp_value, f"Mismatch in {key}: {act_value} != {exp_value}"

packages/common-library/tests/test_dict_tools.py

@@ -6,6 +6,7 @@
 from typing import Any
 
 import pytest
+from common_library.dict_tools import assert_equal_ignoring_none
 from common_library.dict_tools import (
     copy_from_dict,
     get_from_dict,
@@ -160,3 +161,31 @@ def test_copy_from_dict(data: dict[str, Any]):
     assert selected_data["Status"]["State"] == data["Status"]["State"]
     assert "Message" not in selected_data["Status"]["State"]
     assert "running" in data["Status"]["State"]
+
+
+@pytest.mark.parametrize(
+    "expected, actual",
+    [
+        ({"a": 1, "b": 2}, {"a": 1, "b": 2, "c": 3}),
+        ({"a": 1, "b": None}, {"a": 1, "b": 42}),
+        ({"a": {"x": 10, "y": None}}, {"a": {"x": 10, "y": 99}}),
+        ({"a": {"x": 10, "y": 20}}, {"a": {"x": 10, "y": 20, "z": 30}}),
+        ({}, {"foo": "bar"}),
+    ],
+)
+def test_assert_equal_ignoring_none_passes(expected, actual):
+    assert_equal_ignoring_none(expected, actual)
+
+@pytest.mark.parametrize(
+    "expected, actual, error_msg",
+    [
+        ({"a": 1, "b": 2}, {"a": 1}, "Missing key b"),
+        ({"a": 1, "b": 2}, {"a": 1, "b": 3}, "Mismatch in b: 3 != 2"),
+        ({"a": {"x": 10, "y": 20}}, {"a": {"x": 10, "y": 99}}, "Mismatch in y: 99 != 20"),
+        ({"a": {"x": 10}}, {"a": {}}, "Missing key x"),
+    ],
+)
+def test_assert_equal_ignoring_none_fails(expected, actual, error_msg):
+    with pytest.raises(AssertionError) as exc_info:
+        assert_equal_ignoring_none(expected, actual)
+    assert error_msg in str(exc_info.value)