Commit 732c12d9 authored by John Budorick's avatar John Budorick Committed by Commit Bot

android: add logging on Reboot failure in with_asan.py.

Bug: 790202
Change-Id: I85de5a5e47f198c988148313107f65a546d4283d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1677009
Commit-Queue: John Budorick <jbudorick@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Auto-Submit: John Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672232}
parent 7f13bb43
...@@ -15,7 +15,9 @@ _SRC_ROOT = os.path.abspath( ...@@ -15,7 +15,9 @@ _SRC_ROOT = os.path.abspath(
os.path.join(os.path.dirname(__file__), '..', '..', '..', '..')) os.path.join(os.path.dirname(__file__), '..', '..', '..', '..'))
sys.path.append(os.path.join(_SRC_ROOT, 'third_party', 'catapult', 'devil')) sys.path.append(os.path.join(_SRC_ROOT, 'third_party', 'catapult', 'devil'))
from devil.android import device_errors
from devil.android import device_utils from devil.android import device_utils
from devil.android.sdk import adb_wrapper
from devil.android.sdk import version_codes from devil.android.sdk import version_codes
from devil.utils import logging_common from devil.utils import logging_common
...@@ -46,7 +48,17 @@ def Asan(args): ...@@ -46,7 +48,17 @@ def Asan(args):
logging.info('disable-verity output:') logging.info('disable-verity output:')
for line in verity_output.splitlines(): for line in verity_output.splitlines():
logging.info(' %s', line) logging.info(' %s', line)
device.Reboot() try:
device.Reboot()
except device_errors.CommandFailedError:
logging.exception('Failed to reboot device.')
logging.error('Devices visible to adb:')
for entry in adb_wrapper.AdbWrapper.Devices(desired_state=None,
long_list=True):
logging.error(' %s: %s',
entry[0].GetDeviceSerial(),
' '.join(entry[1:]))
# Call EnableRoot prior to asan_device_setup.sh to ensure it doesn't # Call EnableRoot prior to asan_device_setup.sh to ensure it doesn't
# get tripped up by the root timeout. # get tripped up by the root timeout.
device.EnableRoot() device.EnableRoot()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment