From 551b06bb679bec2b0c63664496e9961b33ed6510 Mon Sep 17 00:00:00 2001
From: Pim van Pelt <pim@ipng.nl>
Date: Mon, 21 Mar 2022 10:23:49 +0000
Subject: [PATCH] Move the output around - first print the unexpected messages,
 only then fail the assertions

---
 tests.py                               | 12 ++++++------
 unittest/yaml/error-subinterface4.yaml | 22 ----------------------
 2 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 unittest/yaml/error-subinterface4.yaml

diff --git a/tests.py b/tests.py
index 65b54d5..9b0d675 100755
--- a/tests.py
+++ b/tests.py
@@ -58,12 +58,6 @@ class YAMLTest(unittest.TestCase):
 
         v = Validator(schema=self.yaml_schema)
         rv, msgs = v.validate(cfg)
-        count = 0
-        if 'test' in unittest and 'errors' in unittest['test'] and 'count' in unittest['test']['errors']:
-            count = unittest['test']['errors']['count']
-        if len(msgs) != count:
-            print(msgs, file=sys.stderr)
-        self.assertEqual(len(msgs), count)
 
         msgs_unexpected = 0
         msgs_expected = []
@@ -80,6 +74,12 @@ class YAMLTest(unittest.TestCase):
             if not this_msg_expected:
                 print("%s: Unexpected message: %s" % (self.yaml_filename, m), file=sys.stderr)
                 fail = True
+
+        count = 0
+        if 'test' in unittest and 'errors' in unittest['test'] and 'count' in unittest['test']['errors']:
+            count = unittest['test']['errors']['count']
+
+        self.assertEqual(len(msgs), count)
         self.assertFalse(fail)
 
         return
diff --git a/unittest/yaml/error-subinterface4.yaml b/unittest/yaml/error-subinterface4.yaml
deleted file mode 100644
index 0c71709..0000000
--- a/unittest/yaml/error-subinterface4.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-test:
-  description: "The length of the generated child LCP name is too long"
-  errors:
-    expected:
-     - "sub-interface .* has LCP with too long name"
-    count: 1
----
-interfaces:
-  GigabitEthernet1/0/0:
-    lcp: "e01234"
-    sub-interfaces:
-      100:
-        description: "Dot1Q subinterface"
-        encapsulation:
-          dot1q: 1234
-      101:
-        description: "QinQ subinterface"
-        addresses: [ 192.0.2.1/24 ]
-        encapsulation:
-          dot1q: 1234
-          inner-dot1q: 2345
-