Revert 203587 "Move CheckInstall to device status and fail on lo..."

trunk/src/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
 import smtplib
 import sys
 import re
 
 from pylib import buildbot_report
 from pylib import android_commands
 from pylib.cmd_helper import GetCmdOutput
 
 
 def DeviceInfo(serial):
   """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.
+    Tuple of device type, build id and report as a string.
   """
 
   def AdbShellCmd(cmd):
     return GetCmdOutput('adb -s %s shell %s' % (serial, cmd),
                         shell=True).strip()
 
   device_type = AdbShellCmd('getprop ro.build.product')
   device_build = AdbShellCmd('getprop ro.build.id')
   device_product_name = AdbShellCmd('getprop ro.product.name')
 
   setup_wizard_disabled = AdbShellCmd(
       'getprop ro.setupwizard.mode') == 'DISABLED'
   battery = AdbShellCmd('dumpsys battery')
-  install_output = GetCmdOutput(['build/android/adb_install_apk.py', '--apk',
-                                 'build/android/CheckInstallApk-debug.apk'])
-  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')),
             '  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'),
-            '  Install Speed: %s KB/s' % install_speed,
             '']
 
   errors = []
   if battery_level < 5:
-    errors += ['Device critically low in battery. Do not use for testing.']
+    errors += ['Device critically low in battery.']
   if not setup_wizard_disabled:
     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.']
-  if install_speed < 800:
-    errors += ['Device install speed too low. Do not use for testing.']
 
-  use_device = (battery_level != 'Unknown' and battery_level >= 5 and
-                install_speed != 'Unknown' and install_speed >= 800)
-  return device_type, device_build, '\n'.join(report), errors, use_device
+  return device_type, device_build, '\n'.join(report), errors
 
 
 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 81 matching lines @@
                     help='Directory where the device path is stored',
                     default=os.path.join(os.path.dirname(__file__), '..',
                                          '..', 'out'))
 
   options, args = parser.parse_args()
   if args:
     parser.error('Unknown options %s' % args)
   devices = android_commands.GetAttachedDevices()
   types, builds, reports, errors = [], [], [], []
   if devices:
-    types, builds, reports, errors, use_device_lst = zip(*[DeviceInfo(dev)
-                                                           for dev in devices])
+    types, builds, reports, errors = zip(*[DeviceInfo(dev) for dev in devices])
 
   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):
     if dev_errors:
       err_msg += ['%s errors:' % serial]
       err_msg += ['    %s' % error for error in dev_errors]
 
   if err_msg:
     buildbot_report.PrintWarning()
     msg = '\n'.join(err_msg)
     print msg
     SendDeviceStatusAlert(msg)
 
-  if False in use_device_lst:
-    # TODO(navabi): Build fails on device status check step if there exists any
-    # 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())