[Android] Make device_status_check handle single-device failures.

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 json
 import logging
 import optparse
@@ skipping 34 matching lines @@
   Args:
     serial: The serial of the attached device to construct info about.
 
   Returns:
     Tuple of device type, build id, report as a string, error messages, and
     boolean indicating whether or not device can be used for testing.
   """
   device = device_utils.DeviceUtils(serial)
   battery = battery_utils.BatteryUtils(device)
 
-  battery_info = {}
+  build_product = ''
+  build_id = ''
   battery_level = 100
   errors = []
   dev_good = True
-  json_data = {
-    'serial': serial,
-    'type': device.build_product,
-    'build': device.build_id,
-    'build_detail': device.GetProp('ro.build.fingerprint'),
-    'battery': {},
-    'imei_slice': 'Unknown',
-    'wifi_ip': device.GetProp('dhcp.wlan0.ipaddress'),
-  }
+  json_data = {}
 
   try:
+    build_product = device.build_product
+    build_id = device.build_id
+
+    json_data = {
+      'serial': serial,
+      'type': build_product,
+      'build': build_id,
+      'build_detail': device.GetProp('ro.build.fingerprint'),
+      'battery': {},
+      'imei_slice': 'Unknown',
+      'wifi_ip': device.GetProp('dhcp.wlan0.ipaddress'),
+    }
+
+    battery_info = {}
     try:
       battery_info = battery.GetBatteryInfo(timeout=5)
       battery_level = int(battery_info.get('level', battery_level))
       json_data['battery'] = battery_info
     except device_errors.CommandFailedError:
       logging.exception('Failed to get battery information for %s', serial)
 
     try:
       for l in device.RunShellCommand(['dumpsys', 'iphonesubinfo'],
                                       check_return=True, timeout=5):
@@ skipping 16 matching lines @@
     if (device.product_name == 'mantaray' and
         battery_info.get('AC powered', None) != 'true'):
       errors += ['Mantaray device not connected to AC power.']
   except device_errors.CommandFailedError:
     logging.exception('Failure while getting device status.')
     dev_good = False
   except device_errors.CommandTimeoutError:
     logging.exception('Timeout while getting device status.')
     dev_good = False
 
-  return (device.build_product, device.build_id, battery_level, errors,
-          dev_good, json_data)
+  return (build_product, build_id, battery_level, errors, dev_good, json_data)
 
 
 def CheckForMissingDevices(options, adb_online_devs):
   """Uses file of previous online devices to detect broken phones.
 
   Args:
     options: out_dir parameter of options argument is used as the base
              directory to load and update the cache file.
     adb_online_devs: A list of serial numbers of the currently visible
                      and online attached devices.
@@ skipping 285 matching lines @@
 
   if num_failed_devs == len(devices):
     return 2
 
   if not devices:
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())