Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-1126: Detection and reporting of failed MRR tests
[csit.git]
/
resources
/
libraries
/
python
/
VatExecutor.py
diff --git
a/resources/libraries/python/VatExecutor.py
b/resources/libraries/python/VatExecutor.py
index
d27e067
..
8c3805c
100644
(file)
--- a/
resources/libraries/python/VatExecutor.py
+++ b/
resources/libraries/python/VatExecutor.py
@@
-204,7
+204,6
@@
class VatTerminal(object):
__LINUX_PROMPT = (":~$ ", "~]$ ", "~]# ")
def __init__(self, node, json_param=True):
__LINUX_PROMPT = (":~$ ", "~]$ ", "~]# ")
def __init__(self, node, json_param=True):
- """TODO: Should we document this constructor can raise RuntimeError?"""
json_text = ' json' if json_param else ''
self.json = json_param
self._node = node
json_text = ' json' if json_param else ''
self.json = json_param
self._node = node
@@
-212,7
+211,7
@@
class VatTerminal(object):
self._ssh.connect(self._node)
try:
self._tty = self._ssh.interactive_terminal_open()
self._ssh.connect(self._node)
try:
self._tty = self._ssh.interactive_terminal_open()
- except
IOError
:
+ except
Exception
:
raise RuntimeError("Cannot open interactive terminal on node {0}".
format(self._node))
raise RuntimeError("Cannot open interactive terminal on node {0}".
format(self._node))
@@
-222,7
+221,7
@@
class VatTerminal(object):
self._tty,
'sudo -S {0}{1}'.format(Constants.VAT_BIN_NAME, json_text),
self.__VAT_PROMPT)
self._tty,
'sudo -S {0}{1}'.format(Constants.VAT_BIN_NAME, json_text),
self.__VAT_PROMPT)
- except
IOError
:
+ except
Exception
:
continue
else:
break
continue
else:
break
@@
-254,9
+253,9
@@
class VatTerminal(object):
"""Execute command on the opened VAT terminal.
:param cmd: Command to be executed.
"""Execute command on the opened VAT terminal.
:param cmd: Command to be executed.
+
:returns: Command output in python representation of JSON format or
None if not in JSON mode.
:returns: Command output in python representation of JSON format or
None if not in JSON mode.
- :raise RuntimeError: If VAT command execution fails.
"""
VatHistory.add_to_vat_history(self._node, cmd)
logger.debug("Executing command in VAT terminal: {0}".format(cmd))
"""
VatHistory.add_to_vat_history(self._node, cmd)
logger.debug("Executing command in VAT terminal: {0}".format(cmd))
@@
-264,7
+263,7
@@
class VatTerminal(object):
out = self._ssh.interactive_terminal_exec_command(self._tty, cmd,
self.__VAT_PROMPT)
self.vat_stdout = out
out = self._ssh.interactive_terminal_exec_command(self._tty, cmd,
self.__VAT_PROMPT)
self.vat_stdout = out
- except
IOError
:
+ except
Exception
:
self._exec_failure = True
vpp_pid = get_vpp_pid(self._node)
if vpp_pid:
self._exec_failure = True
vpp_pid = get_vpp_pid(self._node)
if vpp_pid:
@@
-346,4
+345,4
@@
class VatTerminal(object):
for line_tmpl in cmd_template:
vat_cmd = line_tmpl.format(**args)
ret.append(self.vat_terminal_exec_cmd(vat_cmd.replace('\n', '')))
for line_tmpl in cmd_template:
vat_cmd = line_tmpl.format(**args)
ret.append(self.vat_terminal_exec_cmd(vat_cmd.replace('\n', '')))
- return ret
+ return ret
\ No newline at end of file