]> git.puffer.fish Git - mirror/frr.git/commitdiff
topogen: show pretty output for skipped messages
authorRafael Zalamena <rzalamena@gmail.com>
Tue, 22 Aug 2017 22:24:16 +0000 (19:24 -0300)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 28 Nov 2018 01:22:12 +0000 (20:22 -0500)
Format them properly instead of printing a dictionary.

tests/topotests/lib/topogen.py

index 177d908746e546e19bf8f05a75aa2a2b20a2185c..1b8fcd7cfc1dfd94779d79c6acc7879d046f13ca 100644 (file)
@@ -109,7 +109,8 @@ class Topogen(object):
         self.routern = 1
         self.switchn = 1
         self.modname = modname
-        self.errors = {}
+        self.errorsd = {}
+        self.errors = ''
         self.peern = 1
         self._init_topo(cls)
         logger.info('loading topology: {}'.format(self.modname))
@@ -357,13 +358,14 @@ class Topogen(object):
 
         # If no code is defined use a sequential number
         if code is None:
-            code = len(self.errors)
+            code = len(self.errorsd)
 
-        self.errors[code] = message
+        self.errorsd[code] = message
+        self.errors += '\n{}: {}'.format(code, message)
 
     def has_errors(self):
         "Returns whether errors exist or not."
-        return len(self.errors) > 0
+        return len(self.errorsd) > 0
 
     def routers_have_failure(self):
         "Runs an assertion to make sure that all routers are running."