X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fhook.py;h=8033c9355cb48e812f680bdc68a22aafc420e48e;hb=687cf6faf29af9ae683965b09d4648fd60f786af;hp=a8f37c7a35b285f93fe96e6e3dd0bc3dcadd2b39;hpb=1314ec6170a1ef713b27c9428271a111368e9790;p=vpp.git diff --git a/test/hook.py b/test/hook.py index a8f37c7a35b..8033c9355cb 100644 --- a/test/hook.py +++ b/test/hook.py @@ -1,20 +1,24 @@ -import signal import os import sys import traceback -from log import RED, single_line_delim, double_line_delim import ipaddress from subprocess import check_output, CalledProcessError + +import scapy.compat +import framework +from config import config +from log import RED, single_line_delim, double_line_delim from util import check_core_path, get_core_path -class Hook(object): +class Hook: """ Generic hooks before/after API/CLI calls """ - def __init__(self, logger): - self.logger = logger + def __init__(self, test): + self.test = test + self.logger = test.logger def before_api(self, api_name, api_args): """ @@ -30,11 +34,12 @@ class Hook(object): return val if len(val) == 6: return '{!s} ({!s})'.format(val, ':'.join(['{:02x}'.format( - ord(x)) for x in val])) + scapy.compat.orb(x)) for x in val])) try: + # we don't call test_type(val) because it is a packed value. return '{!s} ({!s})'.format(val, str( ipaddress.ip_address(val))) - except ipaddress.AddressValueError: + except ValueError: return val _args = ', '.join("{!s}={!r}".format(key, _friendly_format(val)) for @@ -67,57 +72,52 @@ class Hook(object): pass -class VppDiedError(Exception): - pass - - class PollHook(Hook): """ Hook which checks if the vpp subprocess is alive """ - def __init__(self, testcase): - super(PollHook, self).__init__(testcase.logger) - self.testcase = testcase + def __init__(self, test): + super(PollHook, self).__init__(test) def on_crash(self, core_path): - self.logger.error("Core file present, debug with: gdb %s %s" % - (self.testcase.vpp_bin, core_path)) + self.logger.error("Core file present, debug with: gdb %s %s", + config.vpp, core_path) check_core_path(self.logger, core_path) - self.logger.error("Running `file %s':" % core_path) + self.logger.error("Running `file %s':", core_path) try: info = check_output(["file", core_path]) self.logger.error(info) except CalledProcessError as e: self.logger.error( - "Could not run `file' utility on core-file, " - "rc=%s" % e.returncode) + "Subprocess returned with error running `file' utility on " + "core-file, " + "rc=%s", e.returncode) + except OSError as e: + self.logger.error( + "Subprocess returned OS error running `file' utility on " + "core-file, " + "oserror=(%s) %s", e.errno, e.strerror) + except Exception as e: + self.logger.error( + "Subprocess returned unanticipated error running `file' " + "utility on core-file, " + "%s", e) 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.testcase.vpp_dead: + if self.test.vpp_dead: # already dead, nothing to do return - self.testcase.vpp.poll() - if self.testcase.vpp.returncode is not None: - signaldict = dict( - (k, v) for v, k in reversed(sorted(signal.__dict__.items())) - if v.startswith('SIG') and not v.startswith('SIG_')) - - 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 = get_core_path(self.testcase.tempdir) + self.test.vpp.poll() + if self.test.vpp.returncode is not None: + self.test.vpp_dead = True + raise framework.VppDiedError(rv=self.test.vpp.returncode) + core_path = get_core_path(self.test.tempdir) if os.path.isfile(core_path): self.on_crash(core_path) - self.testcase.vpp_dead = True - raise VppDiedError(msg) def before_api(self, api_name, api_args): """ @@ -146,15 +146,28 @@ class PollHook(Hook): class StepHook(PollHook): """ Hook which requires user to press ENTER before doing any API/CLI """ - def __init__(self, testcase): + def __init__(self, test): self.skip_stack = None self.skip_num = None self.skip_count = 0 - super(StepHook, self).__init__(testcase) + self.break_func = None + super(StepHook, self).__init__(test) def skip(self): - if self.skip_stack is None: - return False + if self.break_func is not None: + return self.should_skip_func_based() + if self.skip_stack is not None: + return self.should_skip_stack_based() + + def should_skip_func_based(self): + stack = traceback.extract_stack() + for e in stack: + if e[2] == self.break_func: + self.break_func = None + return False + return True + + def should_skip_stack_based(self): stack = traceback.extract_stack() counter = 0 skip = True @@ -187,6 +200,7 @@ class StepHook(PollHook): print(single_line_delim) print("You may enter a number of stack frame chosen from above") print("Calls in/below that stack frame will be not be stepped anymore") + print("Alternatively, enter a test function name to stop at") print(single_line_delim) while True: print("Enter your choice, if any, and press ENTER to continue " @@ -198,6 +212,8 @@ class StepHook(PollHook): if choice is not None: num = int(choice) except ValueError: + if choice.startswith("test_"): + break print("Invalid input") continue if choice is not None and (num < 0 or num >= len(stack)): @@ -205,8 +221,12 @@ class StepHook(PollHook): continue break if choice is not None: - self.skip_stack = stack - self.skip_num = num + if choice.startswith("test_"): + self.break_func = choice + else: + self.break_func = None + self.skip_stack = stack + self.skip_num = num def before_cli(self, cli): """ Wait for ENTER before executing CLI """