sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-01-31 02:00:45 +00:00
Code Issues Releases Wiki Activity

fix: AdbConnection: added automatic detection of new line separators

Browse Source 
The newline separator is a property of AdbConnection while the adb_shell is
just a method of the android module, thus we do not have a "self" pointer
to and AdbConnection from within the adb_shell function.

This patch fixes 8de24b5 by exposing the newline_separator used by adb_shell
as a parameter of that method and using the AdbConnection::newline_separator
to properly initialize it at executue() time.

Signed-off-by: Patrick Bellasi <patrick.bellasi@arm.com>
This commit is contained in:
Patrick Bellasi 2016-03-28 12:29:45 +01:00
parent 10978b0fd7
commit c2329bd80e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devlib/utils/android.py
View File

@ -198,7 +198,8 @@ class AdbConnection(object):
return adb_command(self.device, command, timeout=timeout) return adb_command(self.device, command, timeout=timeout)
def execute(self, command, timeout=None, check_exit_code=False, as_root=False): def execute(self, command, timeout=None, check_exit_code=False, as_root=False):
return adb_shell(self.device, command, timeout, check_exit_code, as_root) return adb_shell(self.device, command, timeout, check_exit_code,
as_root, self.newline_separator)
def background(self, command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, as_root=False): def background(self, command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, as_root=False):
return adb_background_shell(self.device, command, stdout, stderr, as_root) return adb_background_shell(self.device, command, stdout, stderr, as_root)
@ -305,7 +306,8 @@ def _ping(device):
return False return False
def adb_shell(device, command, timeout=None, check_exit_code=False, as_root=False): # NOQA def adb_shell(device, command, timeout=None, check_exit_code=False,
as_root=False, newline_separator='\r\n'): # NOQA
_check_env() _check_env()
if as_root: if as_root:
command = 'echo \'{}\' | su'.format(escape_single_quotes(command)) command = 'echo \'{}\' | su'.format(escape_single_quotes(command))
@ -319,9 +321,9 @@ def adb_shell(device, command, timeout=None, check_exit_code=False, as_root=Fals
raw_output, error = check_output(actual_command, timeout, shell=True) raw_output, error = check_output(actual_command, timeout, shell=True)
if raw_output: if raw_output:
try: try:
output, exit_code, _ = raw_output.rsplit(self.newline_separator, 2) output, exit_code, _ = raw_output.rsplit(newline_separator, 2)
except ValueError: except ValueError:
exit_code, _ = raw_output.rsplit(self.newline_separator, 1) exit_code, _ = raw_output.rsplit(newline_separator, 1)
output = '' output = ''
else: # raw_output is empty else: # raw_output is empty
exit_code = '969696' # just because exit_code = '969696' # just because