X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fssh.py;h=7b15998be08816b14d7bf625a1e435236b841d31;hp=3a2c1b661a8546639b7790ffd3f8a1983c4c03c9;hb=bb556a4165bba435f21f8f4745b5c64cc277d9dc;hpb=4d9b95cde48fe1b9abf70a5c7c2edcdb3199776d 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):