From 55c9b05cdbb46355cf6bd7385274fcdf22a49ba9 Mon Sep 17 00:00:00 2001 From: Jason Kirtland Date: Thu, 1 Nov 2007 23:13:30 +0000 Subject: [PATCH] Tweaks for assert_unordered_result --- test/testlib/testing.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/testlib/testing.py b/test/testlib/testing.py index 60b0173d8f..941ddf2497 100644 --- a/test/testlib/testing.py +++ b/test/testlib/testing.py @@ -316,12 +316,18 @@ class AssertMixin(PersistTest): self.fail('Unexpected type "%s", expected "%s"' % ( type(wrong).__name__, cls.__name__)) + if len(found) != len(expected): + self.fail('Unexpected object count "%s", expected "%s"' % ( + len(found), len(expected))) + NOVALUE = object() def _compare_item(obj, spec): for key, value in spec.iteritems(): if isinstance(value, tuple): - if (not self.assert_unordered_result( - getattr(obj, key), value[0], *value[1])): + try: + self.assert_unordered_result( + getattr(obj, key), value[0], *value[1]) + except AssertionError: return False else: if getattr(obj, key, NOVALUE) != value: -- 2.47.3