commit 732c12d9ee76771d0a91b0d957fe557d382a2a07
author John Budorick <jbudorick@chromium.org> Tue Jun 25 20:15:10 2019
committer Commit Bot <commit-bot@chromium.org> Tue Jun 25 20:15:10 2019
tree 55731b91002f1b90772eec1cd6edf6ea8428cd23
parent 7f13bb43afc9c363cef33e6364efb4050334688a

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: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672232}

tools/android/asan/third_party/with_asan.py

diff --git a/tools/android/asan/third_party/with_asan.py b/tools/android/asan/third_party/with_asan.py
index 64bc531..23050205 100755
--- a/tools/android/asan/third_party/with_asan.py
+++ b/tools/android/asan/third_party/with_asan.py
@@ -15,7 +15,9 @@
     os.path.join(os.path.dirname(__file__), '..', '..', '..', '..'))
 
 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.sdk import adb_wrapper
 from devil.android.sdk import version_codes
 from devil.utils import logging_common
 
@@ -46,7 +48,17 @@
         logging.info('disable-verity output:')
         for line in verity_output.splitlines():
           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
     # get tripped up by the root timeout.
     device.EnableRoot()