python: Do not sort lists when asserting dictionary equality

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>

1 files changed, 26 insertions, 4 deletions

diff --git a/share/python/template/asserts.py b/share/python/template/asserts.py
index c898454..33609ce 100644
--- a/share/python/template/asserts.py
+++ b/share/python/template/asserts.py
@@ -9,15 +9,37 @@ def assert_ne(a, b):
 
 
 # Check that two dict values are equal.
-def assert_dict_eq(a, b):
-    assert isinstance(a, dict)
-    assert isinstance(b, dict)
+def _assert_dict_eq(a, b):
     for key in a:
         assert key in b, f"exected {key} in both dicts"
         av = a[key]
         bv = b[key]
         assert_eq(type(av), type(bv))
         if isinstance(av, list):
-            assert_eq(list(sorted(av)), list(sorted(bv)))
+            _assert_list_eq(av, bv)
+        elif isinstance(av, dict):
+            _assert_dict_eq(av, bv)
+        else:
+            assert_eq(av, bv)
     for key in b:
         assert key in a, f"exected {key} in both dicts"
+
+
+# Check that two list values are equal
+def _assert_list_eq(a, b):
+    assert_eq(len(a), len(b))
+    for (av, bv) in zip(a, b):
+        assert_eq(type(av), type(bv))
+        if isinstance(av, list):
+            _assert_list_eq(av, bv)
+        elif isinstance(av, dict):
+            _assert_dict_eq(av, bv)
+        else:
+            assert_eq(av, bv)
+
+
+# Recursively check two dictionaries are equal
+def assert_dict_eq(a, b):
+    assert isinstance(a, dict)
+    assert isinstance(b, dict)
+    _assert_dict_eq(a, b)