From bfaf159831537576ce660e9703b45f91d1a2e7dc Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Fri, 11 Jun 2021 21:23:42 +0100 Subject: python: Do not sort lists when asserting dictionary equality Signed-off-by: Daniel Silverstone --- share/python/template/asserts.py | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'share') 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) -- cgit v1.2.1