Small (very small) improvements when tested with multiple alternate expected output (no longer relies on assertEquals and an AssertionError being raised; now makes comparison with == and eventually call fail() with a sensible error message)

tbroyer · tbroyer · commit dc590a6a7119 · 2007-05-28T07:02:04.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40628
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
@@ -45,15 +45,14 @@ def mockTest(self, expected, input, options):
         exception = None
         result = self.serialize_html(input, options)
         for alternative in expected:
-            try:
-                self.assertEquals(alternative, result)
-            except AssertionError:
-                pass
-            else:
+            if alternative == result:
                 break
         else:
-            options["omit_optional_tags"] = False
-            self.assertEquals(self.serialize_html(input, options), result)
+            if options.get("omit_optional_tags", True):
+                options["omit_optional_tags"] = False
+                self.assertEquals(self.serialize_html(input, options), result)
+            else:
+                self.fail("Expected: %s, Received: %s" % (expected, result))
 
     def serialize_html(self, input, options):
         return u''.join(serializer.HTMLSerializer( \
