[Android] Minor fixes for device_status_check.

This includes:
 - catching IOError on failure to reset USB
 - adding newlines to the bot status output

BUG=

Review URL: https://codereview.chromium.org/1314123005

Cr-Original-Commit-Position: refs/heads/master@{#347713}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 46e0c7d3fd1f7a484f6319240f120378b4c48cd3
This commit is contained in:
jbudorick 2015-09-08 09:21:09 -07:00 коммит произвёл Commit bot
Родитель 90b93a3b87
Коммит 32c42d8299
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -243,7 +243,7 @@ def RecoverDevices(devices, blacklist):
for serial in should_restart_usb: for serial in should_restart_usb:
try: try:
reset_usb.reset_android_usb(serial) reset_usb.reset_android_usb(serial)
except device_errors.DeviceUnreachableError: except (IOError, device_errors.DeviceUnreachableError):
logging.exception('Unable to reset USB for %s.', serial) logging.exception('Unable to reset USB for %s.', serial)
if blacklist: if blacklist:
blacklist.Extend([serial]) blacklist.Extend([serial])
@ -348,7 +348,7 @@ def main():
try: try:
if status['adb_status'] == 'device': if status['adb_status'] == 'device':
f.write('{serial} {adb_status} {build_product} {build_id} ' f.write('{serial} {adb_status} {build_product} {build_id} '
'{temperature:.1f}C {level}%'.format( '{temperature:.1f}C {level}%\n'.format(
serial=status['serial'], serial=status['serial'],
adb_status=status['adb_status'], adb_status=status['adb_status'],
build_product=status['type'], build_product=status['type'],