[Android] Minor fixes for device_status_check.

build/android/buildbot/bb_device_status_check.py

 #!/usr/bin/env python
 #
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A class to keep track of devices across builds and report state."""
 import argparse
 import json
 import logging
@@ skipping 225 matching lines @@
   for d in should_reboot_device:
     logging.debug('  %s', d)
 
   blacklist.Reset()
 
   if should_restart_adb:
     KillAllAdb()
   for serial in should_restart_usb:
     try:
       reset_usb.reset_android_usb(serial)
-    except device_errors.DeviceUnreachableError:
+    except (IOError, device_errors.DeviceUnreachableError):
       logging.exception('Unable to reset USB for %s.', serial)
       if blacklist:
         blacklist.Extend([serial])
 
   def blacklisting_recovery(device):
     if blacklist and device.adb.GetDeviceSerial() in blacklist.Read():
       logging.debug('%s is blacklisted, skipping recovery.', str(device))
       return
 
     if device in should_reboot_device:
@@ skipping 84 matching lines @@
       last_devices_path,
       [status['serial'] for status in statuses])
 
   # Write device info to file for buildbot info display.
   if os.path.exists('/home/chrome-bot'):
     with open('/home/chrome-bot/.adb_device_info', 'w') as f:
       for status in statuses:
         try:
           if status['adb_status'] == 'device':
             f.write('{serial} {adb_status} {build_product} {build_id} '
-                    '{temperature:.1f}C {level}%'.format(
+                    '{temperature:.1f}C {level}%\n'.format(
                 serial=status['serial'],
                 adb_status=status['adb_status'],
                 build_product=status['type'],
                 build_id=status['build'],
                 temperature=float(status['battery']['temperature']) / 10,
                 level=status['battery']['level']
             ))
           else:
             f.write('{serial} {adb_status}'.format(
                 serial=status['serial'],
@@ skipping 10 matching lines @@
   live_devices = [status['serial'] for status in statuses
                   if (status['adb_status'] == 'device'
                       and status['serial'] not in blacklist.Read())]
 
   # If all devices failed, or if there are no devices, it's an infra error.
   return 0 if live_devices else constants.INFRA_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())