From: GalaxyGorilla <sascha@netdef.org>
Date: Fri, 22 May 2020 21:18:46 +0000 (+0000)
Subject: tests: Fix JSON diff for nested lists
X-Git-Tag: base_7.5~350^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b3100f6ce7b17302c03c7c8e411ab5b6c970a875;p=matthieu%2Ffrr.git

tests: Fix JSON diff for nested lists

The involved piece of code is supposed to find a 'closest' match for two
JSON structures using another JSON diff. However, it can happen that
during that new diff the JSON structures are altered (elements from a
list are deleted when 'found'). This is in general ok when the deleted
element is part of the JSON structure which 'matches', but when it later
turns out that some other element of the structure doesn't fit, then the
whole structure should be recovered. This is now realized by using a
deepcopy for the besaid new JSON diff such that the original is only
altered (e.g. deleted) when the diff is clean.

Signed-off-by: GalaxyGorilla <sascha@netdef.org>
---

diff --git a/tests/topotests/lib/test/test_json.py b/tests/topotests/lib/test/test_json.py
index 4b79664018..7a061a9bc6 100755
--- a/tests/topotests/lib/test/test_json.py
+++ b/tests/topotests/lib/test/test_json.py
@@ -463,5 +463,39 @@ def test_json_object_asterisk_matching():
     assert json_cmp(dcomplete, dsub4) is None
 
 
+def test_json_list_nested_with_objects():
+
+    dcomplete = [
+        {
+            "key": 1,
+            "list": [
+                123
+            ]
+        },
+        {
+            "key": 2,
+            "list": [
+                123
+            ]
+        }
+    ]
+
+    dsub1 = [
+        {
+            "key": 2,
+            "list": [
+                123
+            ]
+        },
+        {
+            "key": 1,
+            "list": [
+                123
+            ]
+        }
+    ]
+
+    assert json_cmp(dcomplete, dsub1) is None
+
 if __name__ == "__main__":
     sys.exit(pytest.main())
diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index b0236b01d6..cefb61d198 100644
--- a/tests/topotests/lib/topotest.py
+++ b/tests/topotests/lib/topotest.py
@@ -173,7 +173,9 @@ def gen_json_diff_report(d1, d2, exact=False, path="> $", acc=(0, "")):
                 closest_diff = None
                 closest_idx = None
                 for idx1, v1 in zip(range(0, len(d1)), d1):
-                    tmp_diff = gen_json_diff_report(v1, v2, path=add_idx(idx1))
+                    tmp_v1 = deepcopy(v1)
+                    tmp_v2 = deepcopy(v2)
+                    tmp_diff = gen_json_diff_report(tmp_v1, tmp_v2, path=add_idx(idx1))
                     if not has_errors(tmp_diff):
                         found_match = True
                         del d1[idx1]