From: Paul Vinciguerra <pvinci@vinciconsulting.com>
Date: Thu, 27 Jun 2019 00:45:08 +0000 (-0400)
Subject: tests: handle TypeErrors in calls to VppDiedError
X-Git-Tag: v20.01-rc0~297
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=fea826077113265cdaf0a341fb9aac330705c8b8;p=vpp.git

tests: handle TypeErrors in calls to VppDiedError

Type: test

Change-Id: I869768ed25efa3350f025fba329466db69805803
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
---

diff --git a/test/framework.py b/test/framework.py
index 79dfe1ae866..aedfbdf8e52 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -84,7 +84,7 @@ class VppDiedError(Exception):
 
         try:
             self.signal_name = VppDiedError.signals_by_value[-rv]
-        except KeyError:
+        except (KeyError, TypeError):
             pass
 
         if testcase is None and method_name is None:
@@ -681,10 +681,9 @@ class VppTestCase(unittest.TestCase):
         super(VppTestCase, self).setUp()
         self.reporter.send_keep_alive(self)
         if self.vpp_dead:
-            raise VppDiedError(self.__class__.__name__, self._testMethodName,
-                               "VPP is dead when setting up the test "
-                               "(%s.%s)." % (self.__class__.__name__,
-                                             self._testMethodName))
+
+            raise VppDiedError(rv=None, testcase=self.__class__.__name__,
+                               method_name=self._testMethodName)
         self.sleep(.1, "during setUp")
         self.vpp_stdout_deque.append(
             "--- test setUp() for %s.%s(%s) starts here ---\n" %