Make the test.errors.count value explicit, update tests which had an implicit count

2022-03-20 19:44:29 +00:00
parent 1ff3ae95cc
commit e46cf3d3a8
8 changed files with 10 additions and 6 deletions
--- a/tests.py
+++ b/tests.py
@ -58,13 +58,10 @@ class YAMLTest(unittest.TestCase):

        v = Validator(schema=self.yaml_schema)
        rv, msgs = v.validate(cfg)
-        count = None
-        try:
+        count = 0
+        if 'test' in unittest and 'errors' in unittest['test'] and 'count' in unittest['test']['errors']:
            count = unittest['test']['errors']['count']
-        except:
-            pass
-        if isinstance(count, int):
-            assert len(msgs) == count, "%s: Expected %d error messages, got %d" % (self.yaml_filename, count, len(msgs))
+        assert len(msgs) == count, "%s: Expected %d error messages, got %d" % (self.yaml_filename, count, len(msgs))

        msgs_unexpected = 0
        msgs_expected = []