Add option to output device status data in format for dashboard.

build/android/device_status_check.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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 logging
 import optparse
 import os
@@ skipping 11 matching lines @@
   """Gathers info on a device via various adb calls.
 
   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.
   """
 
-  def AdbShellCmd(cmd):
-    return GetCmdOutput('adb -s %s shell %s' % (serial, cmd),
-                        shell=True).strip()
-
   device_adb = android_commands.AndroidCommands(serial)
 
-  # TODO(navabi): Replace AdbShellCmd with device_adb.
-  device_type = AdbShellCmd('getprop ro.build.product')
-  device_build = AdbShellCmd('getprop ro.build.id')
-  device_build_type = AdbShellCmd('getprop ro.build.type')
-  device_product_name = AdbShellCmd('getprop ro.product.name')
+  def AdbShellCommand(cmd):
+    return '\n'.join(device_adb.RunShellCommand(cmd))
 
-  setup_wizard_disabled = AdbShellCmd(
+  device_type = AdbShellCommand('getprop ro.build.product')
+  device_build = AdbShellCommand('getprop ro.build.id')
+  device_build_type = AdbShellCommand('getprop ro.build.type')
+  device_product_name = AdbShellCommand('getprop ro.product.name')
+
+  setup_wizard_disabled = device_adb.RunShellCommand(
       'getprop ro.setupwizard.mode') == 'DISABLED'
-  battery = AdbShellCmd('dumpsys battery')
+  battery = AdbShellCommand('dumpsys battery')
   install_output = GetCmdOutput(
     ['%s/build/android/adb_install_apk.py' % constants.DIR_SOURCE_ROOT, '--apk',
      '%s/build/android/CheckInstallApk-debug.apk' % constants.DIR_SOURCE_ROOT])
   install_speed_found = re.findall('(\d+) KB/s', install_output)
   if install_speed_found:
     install_speed = int(install_speed_found[0])
   else:
     install_speed = 'Unknown'
   if 'Error' in battery:
     ac_power = 'Unknown'
     battery_level = 'Unknown'
     battery_temp = 'Unknown'
   else:
     ac_power = re.findall('AC powered: (\w+)', battery)[0]
     battery_level = int(re.findall('level: (\d+)', battery)[0])
     battery_temp = float(re.findall('temperature: (\d+)', battery)[0]) / 10
   report = ['Device %s (%s)' % (serial, device_type),
-            '  Build: %s (%s)' % (device_build,
-                                  AdbShellCmd('getprop ro.build.fingerprint')),
+            '  Build: %s (%s)' %
+              (device_build,
+               AdbShellCommand('getprop ro.build.fingerprint')),
             '  Battery: %s%%' % battery_level,
             '  Battery temp: %s' % battery_temp,
-            '  IMEI slice: %s' % AdbShellCmd('dumpsys iphonesubinfo '
-                                             '| grep Device'
-                                             "| awk '{print $4}'")[-6:],
-            '  Wifi IP: %s' % AdbShellCmd('getprop dhcp.wlan0.ipaddress'),
+            '  IMEI slice: %s' % AdbShellCommand('dumpsys iphonesubinfo '
+                                                 '| grep Device'
+                                                 "| awk '{print $4}'")[-6:],
+            '  Wifi IP: %s' % AdbShellCommand('getprop dhcp.wlan0.ipaddress'),
             '  Install Speed: %s KB/s' % install_speed,
             '']
 
   errors = []
   if battery_level < 15:
     errors += ['Device critically low in battery. Turning off device.']
   if (not setup_wizard_disabled and device_build_type != 'user' and
       not options.no_provisioning_check):
     errors += ['Setup wizard not disabled. Was it provisioned correctly?']
   if device_product_name == 'mantaray' and ac_power != 'true':
     errors += ['Mantaray device not connected to AC power.']
   # TODO(navabi): Insert warning once we have a better handle of what install
   # speeds to expect. The following lines were causing too many alerts.
   # if install_speed < 500:
   #   errors += ['Device install speed too low. Do not use for testing.']
 
   # Causing the device status check step fail for slow install speed or low
   # battery currently is too disruptive to the bots (especially try bots).
   # Turn off devices with low battery and the step does not fail.
   if battery_level < 15:
     device_adb.EnableAdbRoot()
-    AdbShellCmd('reboot -p')
-  return device_type, device_build, '\n'.join(report), errors, True
+    AdbShellCommand('reboot -p')
+  full_report = '\n'.join(report)
+  return device_type, device_build, battery_level, full_report, errors, True
 
 
 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 77 matching lines @@
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('', '--out-dir',
                     help='Directory where the device path is stored',
                     default=os.path.join(os.path.dirname(__file__), '..',
                                          '..', 'out'))
   parser.add_option('--no-provisioning-check',
                     help='Will not check if devices are provisioned properly.')
 
+  parser.add_option('--device-status-dashboard',
+                    help='Output device status data for dashboard.')
+
   options, args = parser.parse_args()
   if args:
     parser.error('Unknown options %s' % args)
   devices = android_commands.GetAttachedDevices()
-  types, builds, reports, errors = [], [], [], []
+  offline_devices = android_commands.GetAttachedOfflineDevices()
+
+  types, builds, batteries, reports, errors = [], [], [], [], []
   fail_step_lst = []
   if devices:
-    types, builds, reports, errors, fail_step_lst = (
+    types, builds, batteries, reports, errors, fail_step_lst = (
         zip(*[DeviceInfo(dev, options) for dev in devices]))
 
+  if options.device_status_dashboard:
+    print '<*>RESULT OnlineDevices: OnlineDevices= %s' % len(devices)

[frankf, 2013/07/16 17:51:19]

You can probably use pylib/perf_tests_helper.py

[navabi, 2013/07/16 19:01:16]

Done.

+    print 'RESULT OfflineDevices: OfflineDevice= %s' % len(offline_devices)
+    for serial, battery in zip(devices, batteries):
+      print 'RESULT DeviceBattery: %s= %s' % (serial, battery)
+    return 0

[frankf, 2013/07/16 17:51:19]

Why return here?

[navabi, 2013/07/16 19:01:16]

The idea was that this will be a separate step from device status check that
only print dashboard data. That step will never fail, only print data to
displayed on the dashboard.

It could also be part of the device status check.

+
   err_msg = CheckForMissingDevices(options, devices) or []
 
   unique_types = list(set(types))
   unique_builds = list(set(builds))
 
   buildbot_report.PrintMsg('Online devices: %d. Device types %s, builds %s'
                            % (len(devices), unique_types, unique_builds))
   print '\n'.join(reports)
 
   for serial, dev_errors in zip(devices, errors):
@@ skipping 12 matching lines @@
     # devices with critically low battery or install speed. Remove those devices
     # from testing, allowing build to continue with good devices.
     return 1
 
   if not devices:
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())