sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-18 20:11:20 +00:00
Code Issues Releases Wiki Activity

Handling duplicate prompt in pxssh in a slightly differnt way.

Browse Source
This commit is contained in:
Sergei Trofimov 2015-04-30 12:35:50 +01:00
parent 556bc84023
commit 0e751bdd73
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wlauto/utils/ssh.py
View File

@ -135,6 +135,7 @@ class SshShell(object):
def _execute_and_wait_for_prompt(self, command, timeout=None, as_root=False, strip_colors=True, log=True):
timeout = self.timeout if timeout is None else timeout
self.conn.prompt(0.1) # clear an existing prompt if there is one.
if as_root:
command = "sudo -- sh -c '{}'".format(escape_single_quotes(command))
if log:
@ -154,15 +155,6 @@ class SshShell(object):
# command to shell.
output = re.sub(r' \r([^\n])', r'\1', self.conn.before)
command_index = output.find(command)
while not timed_out and command_index == -1:
# In case of a "premature" timeout (i.e. timeout, but no hang,
# so command completes afterwards), there may be a prompt from
# the previous command completion in the serial output. This
# checks for this case by making sure that the original command
# is present in the serial output and waiting for the next
# prompt if it is not.
output = re.sub(r' \r([^\n])', r'\1', self.conn.before)
command_index = output.find(command)
output = output[command_index + len(command):].strip()
if timed_out:
raise TimeoutError(command, output)