X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fhook.py;h=d7bfef6c1017c01aabce8474da64076a3784a704;hb=2fee16787ed0d622631223567635a77e14c8c076;hp=f4bafa16f1931a46a17b248c0cd962f2f7b823c1;hpb=9b6ece79521a4628fc4116378862db1bdb77be49;p=vpp.git

diff --git a/test/hook.py b/test/hook.py
index f4bafa16f19..d7bfef6c101 100644
--- a/test/hook.py
+++ b/test/hook.py
@@ -5,6 +5,7 @@ import traceback
 from log import RED, single_line_delim, double_line_delim
 from debug import spawn_gdb
 from subprocess import check_output, CalledProcessError
+from util import check_core_path
 
 
 class Hook(object):
@@ -70,6 +71,7 @@ class PollHook(Hook):
         else:
             self.logger.error("Core file present, debug with: gdb %s %s" %
                               (self.testcase.vpp_bin, core_path))
+            check_core_path(self.logger, core_path)
             self.logger.error("Running `file %s':" % core_path)
             try:
                 info = check_output(["file", core_path])
@@ -174,19 +176,19 @@ class StepHook(PollHook):
             print('%02d.\t%s\t%s:%d\t[%s]' % (counter, e[2], e[0], e[1], e[3]))
             counter += 1
         print(single_line_delim)
-        print("You can enter a number of stack frame chosen from above")
+        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(single_line_delim)
         while True:
-            choice = sys.stdin.readline(
-                "Enter your choice, if any, and press ENTER to continue "
-                "running the testcase...")
+            print("Enter your choice, if any, and press ENTER to continue "
+                  "running the testcase...")
+            choice = sys.stdin.readline()
             if choice == "":
                 choice = None
             try:
                 if choice is not None:
                     num = int(choice)
-            except TypeError:
+            except ValueError:
                 print("Invalid input")
                 continue
             if choice is not None and (num < 0 or num >= len(stack)):