From e46cf3d3a860abc8654a112af12b7ed76a79afb9 Mon Sep 17 00:00:00 2001
From: Pim van Pelt <pim@ipng.nl>
Date: Sun, 20 Mar 2022 19:44:29 +0000
Subject: [PATCH] Make the test.errors.count value explicit, update tests which
 had an implicit count

---
 tests.py                                | 9 +++------
 unittest/yaml/error-interface-mtu1.yaml | 1 +
 unittest/yaml/error-interface-mtu2.yaml | 1 +
 unittest/yaml/error-subinterface1.yaml  | 1 +
 unittest/yaml/error-subinterface2.yaml  | 1 +
 unittest/yaml/error-subinterface4.yaml  | 1 +
 unittest/yaml/error-subinterface5.yaml  | 1 +
 unittest/yaml/error-subinterface7.yaml  | 1 +
 8 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests.py b/tests.py
index f5efdee..4fca629 100755
--- 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 = []
diff --git a/unittest/yaml/error-interface-mtu1.yaml b/unittest/yaml/error-interface-mtu1.yaml
index 973f755..62b4ec6 100644
--- a/unittest/yaml/error-interface-mtu1.yaml
+++ b/unittest/yaml/error-interface-mtu1.yaml
@@ -4,6 +4,7 @@ test:
     expected: 
      - "mtu.*less than 128"
      - "mtu.*greater than 9216"
+    count: 2
 ---
 interfaces:
   GigabitEthernet1/0/0:
diff --git a/unittest/yaml/error-interface-mtu2.yaml b/unittest/yaml/error-interface-mtu2.yaml
index 0fa4bd7..3c14020 100644
--- a/unittest/yaml/error-interface-mtu2.yaml
+++ b/unittest/yaml/error-interface-mtu2.yaml
@@ -3,6 +3,7 @@ test:
   errors:
     expected: 
      - "sub-interface .* has MTU 9001 higher than parent MTU 9000"
+    count: 1
 ---
 interfaces:
   GigabitEthernet1/0/0:
diff --git a/unittest/yaml/error-subinterface1.yaml b/unittest/yaml/error-subinterface1.yaml
index fb36612..ff2984f 100644
--- a/unittest/yaml/error-subinterface1.yaml
+++ b/unittest/yaml/error-subinterface1.yaml
@@ -4,6 +4,7 @@ test:
     expected:
      - "100 .* unique encapsulation"
      - "101 .* unique encapsulation"
+    count: 2
 ---
 interfaces:
   GigabitEthernet1/0/0:
diff --git a/unittest/yaml/error-subinterface2.yaml b/unittest/yaml/error-subinterface2.yaml
index c7a774e..76ec93e 100644
--- a/unittest/yaml/error-subinterface2.yaml
+++ b/unittest/yaml/error-subinterface2.yaml
@@ -3,6 +3,7 @@ test:
   errors:
     expected:
      - "sub-interface .* has LCP but .* does not have LCP"
+    count: 1
 ---
 interfaces:
   GigabitEthernet1/0/0:
diff --git a/unittest/yaml/error-subinterface4.yaml b/unittest/yaml/error-subinterface4.yaml
index c142978..0c71709 100644
--- a/unittest/yaml/error-subinterface4.yaml
+++ b/unittest/yaml/error-subinterface4.yaml
@@ -3,6 +3,7 @@ test:
   errors:
     expected:
      - "sub-interface .* has LCP with too long name"
+    count: 1
 ---
 interfaces:
   GigabitEthernet1/0/0:
diff --git a/unittest/yaml/error-subinterface5.yaml b/unittest/yaml/error-subinterface5.yaml
index e9254c8..1e3d379 100644
--- a/unittest/yaml/error-subinterface5.yaml
+++ b/unittest/yaml/error-subinterface5.yaml
@@ -3,6 +3,7 @@ test:
   errors:
     expected:
      - "sub-interface .* has an address but .* does not have LCP"
+    count: 1
 ---
 interfaces:
   GigabitEthernet1/0/0:
diff --git a/unittest/yaml/error-subinterface7.yaml b/unittest/yaml/error-subinterface7.yaml
index 15eaf3c..23780ab 100644
--- a/unittest/yaml/error-subinterface7.yaml
+++ b/unittest/yaml/error-subinterface7.yaml
@@ -3,6 +3,7 @@ test:
   errors:
     expected:
      - "sub-interface .* has no config"
+    count: 1
 ---
 interfaces:
   GigabitEthernet1/0/0: