X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fhook.py;h=ccc5c86b9c3fcd098a915abf75e813633fc0b5ad;hb=ca76831df3b6abd3c4af6381b873d9f589f20af7;hp=d23604ba13fe16e0324f787125b8e51c9c03baa3;hpb=38a4ec7342c27e675cc049d923e0075655fd91fd;p=vpp.git

diff --git a/test/hook.py b/test/hook.py
index d23604ba13f..ccc5c86b9c3 100644
--- a/test/hook.py
+++ b/test/hook.py
@@ -5,11 +5,10 @@ import traceback
 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):
@@ -35,12 +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
@@ -85,7 +84,7 @@ class PollHook(Hook):
 
     def on_crash(self, core_path):
         self.logger.error("Core file present, debug with: gdb %s %s",
-                          self.testcase.vpp_bin, core_path)
+                          self.test.vpp_bin, core_path)
         check_core_path(self.logger, core_path)
         self.logger.error("Running `file %s':", core_path)
         try: