From fa7ea5d7c442ecefda52515b7b559a6869ccd6b6 Mon Sep 17 00:00:00 2001 From: Victor Sergeyev Date: Wed, 19 Jun 2013 16:27:41 +0300 Subject: Modify _assertEqualListsOfObjects() function. Function _assertEqualListsOfObjects() changed in order to compare lists of objects without `id` key. It can be usefull if we have no `id` in test data. Change-Id: Ic3d599166e5a83969ef804bc9f7801cd2c9d0770 --- nova/tests/db/test_db_api.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'nova') diff --git a/nova/tests/db/test_db_api.py b/nova/tests/db/test_db_api.py index 67cabfafc..90bf366fc 100644 --- a/nova/tests/db/test_db_api.py +++ b/nova/tests/db/test_db_api.py @@ -1299,10 +1299,11 @@ class ModelsObjectComparatorMixin(object): self.assertEqual(value, obj2[key]) def _assertEqualListsOfObjects(self, objs1, objs2, ignored_keys=None): - self.assertEqual(len(objs1), len(objs2)) - objs2 = dict([(o['id'], o) for o in objs2]) - for o1 in objs1: - self._assertEqualObjects(o1, objs2[o1['id']], ignored_keys) + obj_to_dict = lambda o: self._dict_from_object(o, ignored_keys) + sort_key = lambda d: [d[k] for k in sorted(d)] + conv_and_sort = lambda obj: sorted(map(obj_to_dict, obj), key=sort_key) + + self.assertEqual(conv_and_sort(objs1), conv_and_sort(objs2)) def _assertEqualListsOfPrimitivesAsSets(self, primitives1, primitives2): self.assertEqual(len(primitives1), len(primitives2)) -- cgit