diff options
| -rw-r--r-- | resources/libraries/python/VatExecutor.py | 4 | ||||
| -rw-r--r-- | resources/libraries/python/ssh.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/resources/libraries/python/VatExecutor.py b/resources/libraries/python/VatExecutor.py index 5f7e188b7f..9db53d3a36 100644 --- a/resources/libraries/python/VatExecutor.py +++ b/resources/libraries/python/VatExecutor.py @@ -157,8 +157,8 @@ class VatTerminal(object): """ - __VAT_PROMPT = "vat# " - __LINUX_PROMPT = ":~$ " + __VAT_PROMPT = ("vat# ", ) + __LINUX_PROMPT = (":~$ ", "~]$ ") def __init__(self, node, json_param=True): json_text = ' json' if json_param else '' diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py index 3a2c1b661a..7b15998be0 100644 --- a/resources/libraries/python/ssh.py +++ b/resources/libraries/python/ssh.py @@ -220,7 +220,7 @@ class SSH(object): chan.set_combine_stderr(True) buf = '' - while not buf.endswith(':~$ '): + while not buf.endswith((":~$ ", "~]$ ")): try: chunk = chan.recv(self.__MAX_RECV_BUF) if not chunk: @@ -265,7 +265,9 @@ class SSH(object): except socket.timeout: raise Exception('Socket timeout: {0}'.format(buf)) tmp = buf.replace(cmd.replace('\n', ''), '') - return tmp.replace(prompt, '') + for p in prompt: + tmp.replace(p, '') + return tmp @staticmethod def interactive_terminal_close(chan): |