api: Implement log_dump/log_details

[vpp.git] / test / framework.py

diff --git a/test/framework.py b/test/framework.py
index 00fee86..4bc64a1 100644 (file)
--- a/test/framework.py
+++ b/test/framework.py
@@ -76,15 +76,24 @@ class VppDiedError(Exception):
     signals_by_value = {v: k for k, v in signal.__dict__.items() if
                         k.startswith('SIG') and not k.startswith('SIG_')}
 
-    def __init__(self, rv=None):
+    def __init__(self, rv=None, testcase=None, method_name=None):
         self.rv = rv
         self.signal_name = None
+        self.testcase = testcase
+        self.method_name = method_name
+
         try:
             self.signal_name = VppDiedError.signals_by_value[-rv]
-        except KeyError:
+        except (KeyError, TypeError):
             pass
 
-        msg = "VPP subprocess died unexpectedly with return code: %d%s." % (
+        if testcase is None and method_name is None:
+            in_msg = ''
+        else:
+            in_msg = 'running %s.%s ' % (testcase, method_name)
+
+        msg = "VPP subprocess died %sunexpectedly with return code: %d%s." % (
+            in_msg,
             self.rv,
             ' [%s]' % self.signal_name if
             self.signal_name is not None else '')
@@ -672,7 +681,9 @@ class VppTestCase(unittest.TestCase):
         super(VppTestCase, self).setUp()
         self.reporter.send_keep_alive(self)
         if self.vpp_dead:
-            raise Exception("VPP is dead when setting up the test")
+
+            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" %
@@ -1446,15 +1457,24 @@ class VppTestRunner(unittest.TextTestRunner):
 
 
 class Worker(Thread):
-    def __init__(self, args, logger, env={}):
+    def __init__(self, args, logger, env=None):
         self.logger = logger
         self.args = args
+        self.process = None
         self.result = None
+        env = {} if env is None else env
         self.env = copy.deepcopy(env)
         super(Worker, self).__init__()
 
     def run(self):
         executable = self.args[0]
+        if not os.path.exists(executable) or not os.access(
+                executable, os.F_OK | os.X_OK):
+            # Exit code that means some system file did not exist,
+            # could not be opened, or had some other kind of error.
+            self.result = os.EX_OSFILE
+            raise EnvironmentError(
+                "executable '%s' is not found or executable." % executable)
         self.logger.debug("Running executable w/args `%s'" % self.args)
         env = os.environ.copy()
         env.update(self.env)