Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
API refactoring : bfd
[vpp.git]
/
test
/
hook.py
diff --git
a/test/hook.py
b/test/hook.py
index
3ae1473
..
f3e5f88
100644
(file)
--- a/
test/hook.py
+++ b/
test/hook.py
@@
-57,7
+57,6
@@
class PollHook(Hook):
""" Hook which checks if the vpp subprocess is alive """
def __init__(self, testcase):
""" Hook which checks if the vpp subprocess is alive """
def __init__(self, testcase):
- self.vpp_dead = False
self.testcase = testcase
self.logger = testcase.logger
self.testcase = testcase
self.logger = testcase.logger
@@
-73,7
+72,7
@@
class PollHook(Hook):
raise Exception("GDB refused to die...")
def on_crash(self, core_path):
raise Exception("GDB refused to die...")
def on_crash(self, core_path):
- if self.testcase.
interactiv
e:
+ if self.testcase.
debug_cor
e:
gdb_path = '/usr/bin/gdb'
if os.path.isfile(gdb_path) and os.access(gdb_path, os.X_OK):
# automatically attach gdb
gdb_path = '/usr/bin/gdb'
if os.path.isfile(gdb_path) and os.access(gdb_path, os.X_OK):
# automatically attach gdb
@@
-92,7
+91,7
@@
class PollHook(Hook):
Poll the vpp status and throw an exception if it's not running
:raises VppDiedError: exception if VPP is not running anymore
"""
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
# already dead, nothing to do
return
@@
-101,9
+100,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_'))
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]" % (
msg = "VPP subprocess died unexpectedly with returncode %d [%s]" % (
- self.testcase.vpp.returncode,
- signaldict[abs(self.testcase.vpp.returncode)])
+ self.testcase.vpp.returncode, s)
self.logger.critical(msg)
core_path = self.testcase.tempdir + '/core'
if os.path.isfile(core_path):
self.logger.critical(msg)
core_path = self.testcase.tempdir + '/core'
if os.path.isfile(core_path):
@@
-111,27
+114,27
@@
class PollHook(Hook):
self.testcase.vpp_dead = True
raise VppDiedError(msg)
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
"""
: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()
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
"""
: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()
self.poll_vpp()