X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fhook.py;h=f34e0c5b1f6289dc533e5eca14a87b197efe4645;hb=d91c1dbdb31f80db7d967f2f57c43d0a81d65297;hp=3ae14737cafbe21494d6432a40b513fc508dba88;hpb=277b89c946e6fdc764ee48726fcd3df1c189eda9;p=vpp.git

diff --git a/test/hook.py b/test/hook.py
index 3ae14737caf..f34e0c5b1f6 100644
--- a/test/hook.py
+++ b/test/hook.py
@@ -1,8 +1,8 @@
 import signal
 import os
-import pexpect
 import traceback
-from log import *
+from log import RED, single_line_delim, double_line_delim
+from debug import spawn_gdb, gdb_path
 
 
 class Hook(object):
@@ -57,42 +57,26 @@ class PollHook(Hook):
     """ Hook which checks if the vpp subprocess is alive """
 
     def __init__(self, testcase):
-        self.vpp_dead = False
         self.testcase = testcase
         self.logger = testcase.logger
 
-    def spawn_gdb(self, gdb_path, core_path):
-        gdb_cmdline = gdb_path + ' ' + self.testcase.vpp_bin + ' ' + core_path
-        gdb = pexpect.spawn(gdb_cmdline)
-        gdb.interact()
-        try:
-            gdb.terminate(True)
-        except:
-            pass
-        if gdb.isalive():
-            raise Exception("GDB refused to die...")
-
     def on_crash(self, core_path):
-        if self.testcase.interactive:
-            gdb_path = '/usr/bin/gdb'
-            if os.path.isfile(gdb_path) and os.access(gdb_path, os.X_OK):
-                # automatically attach gdb
-                self.spawn_gdb(gdb_path, core_path)
-                return
-            else:
+        if self.testcase.debug_core:
+            if not spawn_gdb(self.testcase.vpp_bin, core_path):
                 self.logger.error(
                     "Debugger '%s' does not exist or is not an executable.." %
                     gdb_path)
-
-        self.logger.critical('core file present, debug with: gdb ' +
-                             self.testcase.vpp_bin + ' ' + core_path)
+            else:
+                return
+        self.logger.critical("Core file present, debug with: gdb %s %s" %
+                             (self.testcase.vpp_bin, core_path))
 
     def poll_vpp(self):
         """
         Poll the vpp status and throw an exception if it's not running
         :raises VppDiedError: exception if VPP is not running anymore
         """
-        if self.vpp_dead:
+        if self.testcase.vpp_dead:
             # already dead, nothing to do
             return
 
@@ -101,9 +85,13 @@ class PollHook(Hook):
             signaldict = dict(
                 (k, v) for v, k in reversed(sorted(signal.__dict__.items()))
                 if v.startswith('SIG') and not v.startswith('SIG_'))
-            msg = "VPP subprocess died unexpectedly with returncode %d [%s]" % (
-                self.testcase.vpp.returncode,
-                signaldict[abs(self.testcase.vpp.returncode)])
+
+            if self.testcase.vpp.returncode in signaldict:
+                s = signaldict[abs(self.testcase.vpp.returncode)]
+            else:
+                s = "unknown"
+            msg = "VPP subprocess died unexpectedly with returncode %d [%s]" %\
+                (self.testcase.vpp.returncode, s)
             self.logger.critical(msg)
             core_path = self.testcase.tempdir + '/core'
             if os.path.isfile(core_path):
@@ -111,27 +99,27 @@ class PollHook(Hook):
             self.testcase.vpp_dead = True
             raise VppDiedError(msg)
 
-    def after_api(self, api_name, api_args):
+    def before_api(self, api_name, api_args):
         """
-        Check if VPP died after executing an API
+        Check if VPP died before executing an API
 
         :param api_name: name of the API
         :param api_args: tuple containing the API arguments
         :raises VppDiedError: exception if VPP is not running anymore
 
         """
-        super(PollHook, self).after_api(api_name, api_args)
+        super(PollHook, self).before_api(api_name, api_args)
         self.poll_vpp()
 
-    def after_cli(self, cli):
+    def before_cli(self, cli):
         """
-        Check if VPP died after executing a CLI
+        Check if VPP died before executing a CLI
 
         :param cli: CLI string
         :raises Exception: exception if VPP is not running anymore
 
         """
-        super(PollHook, self).after_cli(cli)
+        super(PollHook, self).before_cli(cli)
         self.poll_vpp()