sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-03-22 10:38:37 +00:00
Code Issues Releases Wiki Activity

minor fixes to cpufreq APIs

Browse Source 
- adding missing cpu id conversion to set_cpu_min_freq
- adding "exact" parameter to set_cpu_frequency; only produce an error
  when the specified frequency is not supported by the cpu if "axact"
  is set; (otherwise let cpufreq decide what the actual frequency will
  be).
This commit is contained in:
Sergei Trofimov 2015-05-11 11:53:36 +01:00
parent 40bd32280a
commit b30d702f22
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wlauto/utils/ssh.py
View File

@ -134,7 +134,6 @@ class SshShell(object):
self.conn.logout() self.conn.logout()
def _execute_and_wait_for_prompt(self, command, timeout=None, as_root=False, strip_colors=True, log=True): 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. self.conn.prompt(0.1) # clear an existing prompt if there is one.
if as_root: if as_root:
command = "sudo -- sh -c '{}'".format(escape_single_quotes(command)) command = "sudo -- sh -c '{}'".format(escape_single_quotes(command))
@ -144,14 +143,14 @@ class SshShell(object):
index = self.conn.expect_exact([self.password_prompt, TIMEOUT], timeout=0.5) index = self.conn.expect_exact([self.password_prompt, TIMEOUT], timeout=0.5)
if index == 0: if index == 0:
self.conn.sendline(self.password) self.conn.sendline(self.password)
timed_out = not self.conn.prompt(timeout) timed_out = self._wait_for_prompt(timeout)
output = re.sub(r'.*?{}'.format(re.escape(command)), '', self.conn.before, 1).strip() output = re.sub(r'.*?{}'.format(re.escape(command)), '', self.conn.before, 1).strip()
else: else:
if log: if log:
logger.debug(command) logger.debug(command)
self.conn.sendline(command) self.conn.sendline(command)
timed_out = not self.conn.prompt(timeout) timed_out = self._wait_for_prompt(timeout)
# the regex removes line breaks potentiall introduced when writing # the regex removes line breaks potential introduced when writing
# command to shell. # command to shell.
output = re.sub(r' \r([^\n])', r'\1', self.conn.before) output = re.sub(r' \r([^\n])', r'\1', self.conn.before)
command_index = output.find(command) command_index = output.find(command)
@ -162,6 +161,14 @@ class SshShell(object):
output = strip_bash_colors(output) output = strip_bash_colors(output)
return output return output
def _wait_for_prompt(self, timeout=None):
if timeout:
return not self.conn.prompt(timeout)
else: # cannot timeout; wait forever
while not self.conn.prompt(self.timeout):
pass
return False
def _scp(self, source, dest, timeout=30): def _scp(self, source, dest, timeout=30):
# NOTE: the version of scp in Ubuntu 12.04 occasionally (and bizarrely) # NOTE: the version of scp in Ubuntu 12.04 occasionally (and bizarrely)
# fails to connect to a device if port is explicitly specified using -P # fails to connect to a device if port is explicitly specified using -P