sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-10-31 15:12:25 +00:00
Code Issues Releases Wiki Activity

utils/android: better error massage when no exit code found

Browse Source 
Provide the stdout/stderr text as part of the messsage in the
exception raised when no exit code can be identified from the adb
command output.
This commit is contained in:
Sergei Trofimov
2017-07-12 13:34:20 +01:00
parent 2a07ed92fe
commit f4b91b6c9e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wlauto/utils/android.py
View File

@@ -367,7 +367,10 @@ def adb_shell(device, command, timeout=None, check_exit_code=False, as_root=Fals
message += '\n{}'.format(am_start_error.findall(output)[0])
raise DeviceError(message)
else:
raise DeviceError('adb has returned early; did not get an exit code. Was kill-server invoked?')
message = 'adb has returned early; did not get an exit code. '\
'Was kill-server invoked?\nOUTPUT:\n-----\n{}\n'\
'-----ERROR:\n-----\n{}\n-----'
raise DeviceError(message.format(raw_output, error))
else: # do not check exit code
try:
output, error = check_output(full_command, timeout, shell=True)