From 6cfd873e4d15542f14927c12e8f691e9fb314499 Mon Sep 17 00:00:00 2001 From: invisig0th Date: Thu, 24 Dec 2020 08:14:41 -0500 Subject: [PATCH] added recursive list/tuple normalization to tests (#2023) added recursive list/tuple normalization to tests --- synapse/tests/utils.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/synapse/tests/utils.py b/synapse/tests/utils.py index c24829f4e8..4e0bddc765 100644 --- a/synapse/tests/utils.py +++ b/synapse/tests/utils.py @@ -75,6 +75,13 @@ async def alist(coro): return [x async for x in coro] +def norm(z): + if isinstance(z, (list, tuple)): + return tuple([norm(n) for n in z]) + if isinstance(z, dict): + return {norm(k): norm(v) for (k, v) in z.items()} + return z + class LibTst(s_stormtypes.Lib): def addLibFuncs(self): @@ -1476,13 +1483,7 @@ def eq(self, x, y, msg=None): ''' Assert X is equal to Y ''' - if type(x) == list: - x = tuple(x) - - if type(y) == list: - y = tuple(y) - - self.assertEqual(x, y, msg=msg) + self.assertEqual(norm(x), norm(y), msg=msg) def eqOrNan(self, x, y, msg=None): ''' @@ -1504,7 +1505,7 @@ def ne(self, x, y): ''' Assert X is not equal to Y ''' - self.assertNotEqual(x, y) + self.assertNotEqual(norm(x), norm(y)) def true(self, x, msg=None): '''