from log import RED, single_line_delim, double_line_delim
import ipaddress
from subprocess import check_output, CalledProcessError
+
+import scapy.compat
+
from util import check_core_path, get_core_path
-try:
- text_type = unicode
-except NameError:
- text_type = str
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
super(PollHook, self).__init__(test)
def on_crash(self, core_path):
- self.logger.error("Core file present, debug with: gdb %s %s" %
- (self.test.vpp_bin, core_path))
+ self.logger.error("Core file present, debug with: gdb %s %s",
+ self.test.vpp_bin, 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):
"""