[Android] Change object types from AndroidCommands to DeviceUtils in build/android/.

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 logging
 import optparse
 import os
@@ skipping 12 matching lines @@
 sys.path.append(os.path.join(os.path.dirname(__file__),
                              os.pardir, os.pardir, 'util', 'lib',
                              'common'))
 import perf_tests_results_helper  # pylint: disable=F0401
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 from pylib import android_commands
 from pylib import constants
 from pylib.cmd_helper import GetCmdOutput
 from pylib.device import device_blacklist
+from pylib.device import device_utils
 
 def DeviceInfo(serial, options):
   """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.
   """
 
-  device_adb = android_commands.AndroidCommands(serial)
-
-  # TODO(navabi): Replace AdbShellCmd with device_adb.
-  device_type = device_adb.GetBuildProduct()
-  device_build = device_adb.GetBuildId()
-  device_build_type = device_adb.GetBuildType()
-  device_product_name = device_adb.GetProductName()
+  device_adb = device_utils.DeviceUtils(serial)
+  device_type = device_adb.old_interface.GetBuildProduct()
+  device_build = device_adb.old_interface.GetBuildId()
+  device_build_type = device_adb.old_interface.GetBuildType()
+  device_product_name = device_adb.old_interface.GetProductName()
 
   try:
-    battery = device_adb.GetBatteryInfo()
+    battery = device_adb.old_interface.GetBatteryInfo()
   except Exception as e:
     battery = None
     logging.error('Unable to obtain battery info for %s, %s', serial, e)
 
   def _GetData(re_expression, line, lambda_function=lambda x:x):
     if not line:
       return 'Unknown'
     found = re.findall(re_expression, line)
     if found and len(found):
       return lambda_function(found[0])
     return 'Unknown'
 
   ac_power = _GetData('AC powered: (\w+)', battery)
   battery_level = _GetData('level: (\d+)', battery)
   battery_temp = _GetData('temperature: (\d+)', battery,
                           lambda x: float(x) / 10.0)
   imei_slice = _GetData('Device ID = (\d+)',
-                        device_adb.GetSubscriberInfo(),
+                        device_adb.old_interface.GetSubscriberInfo(),
                         lambda x: x[-6:])
   report = ['Device %s (%s)' % (serial, device_type),
             '  Build: %s (%s)' %
-              (device_build, device_adb.GetBuildFingerprint()),
+              (device_build, device_adb.old_interface.GetBuildFingerprint()),
             '  Battery: %s%%' % battery_level,
             '  Battery temp: %s' % battery_temp,
             '  IMEI slice: %s' % imei_slice,
-            '  Wifi IP: %s' % device_adb.GetWifiIP(),
+            '  Wifi IP: %s' % device_adb.old_interface.GetWifiIP(),
             '']
 
   errors = []
   if battery_level < 15:
     errors += ['Device critically low in battery. Turning off device.']
   if not options.no_provisioning_check:
-    setup_wizard_disabled = device_adb.GetSetupWizardStatus() == 'DISABLED'
+    setup_wizard_disabled = (
+        device_adb.old_interface.GetSetupWizardStatus() == 'DISABLED')
     if not setup_wizard_disabled and device_build_type != 'user':
       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.']
 
   # Turn off devices with low battery.
   if battery_level < 15:
-    device_adb.EnableAdbRoot()
-    device_adb.Shutdown()
+    device_adb.old_interface.EnableAdbRoot()
+    device_adb.old_interface.Shutdown()
   full_report = '\n'.join(report)
   return device_type, device_build, battery_level, full_report, errors, True
 
 
 def GetLastDevices(out_dir):
   """Returns a list of devices that have been seen on the bot.
 
   Args:
     options: out_dir parameter of options argument is used as the base
              directory to load and update the cache file.
@@ skipping 62 matching lines @@
                                 (os.environ.get('BUILDBOT_BUILDERNAME'),
                                  os.environ.get('BUILDBOT_SLAVENAME'),
                                  os.environ.get('BUILDBOT_BUILDNUMBER')))))
     return ['Current online devices: %s' % adb_online_devs,
             '%s are no longer visible. Were they removed?\n' % missing_devs,
             'SHERIFF:\n',
             '@@@STEP_LINK@Click here to file a bug@%s@@@\n' % crbug_link,
             'Cache file: %s\n\n' % last_devices_path,
             'adb devices: %s' % GetCmdOutput(['adb', 'devices']),
             'adb devices(GetAttachedDevices): %s' %
-            android_commands.GetAttachedDevices()]
+                android_commands.GetAttachedDevices()]
   else:
     new_devs = set(adb_online_devs) - set(last_devices)
     if new_devs and os.path.exists(last_devices_path):
       bb_annotations.PrintWarning()
       bb_annotations.PrintSummaryText(
           '%d new devices detected' % len(new_devs))
       print ('New devices detected %s. And now back to your '
              'regularly scheduled program.' % list(new_devs))
 
 
@@ skipping 107 matching lines @@
           # All devices are online, keep going.
           break
         if not usb_restarted and devices:
           # The USB wasn't restarted, but there's at least one device online.
           # No point in trying to wait for all devices.
           break
         retries -= 1
 
   devices = android_commands.GetAttachedDevices()
   # TODO(navabi): Test to make sure this fails and then fix call
-  offline_devices = android_commands.GetAttachedDevices(hardware=False,
-                                                        emulator=False,
-                                                        offline=True)
+  offline_devices = android_commands.GetAttachedDevices(
+      hardware=False, emulator=False, offline=True)
 
   types, builds, batteries, reports, errors = [], [], [], [], []
   fail_step_lst = []
   if devices:
     types, builds, batteries, reports, errors, fail_step_lst = (
         zip(*[DeviceInfo(dev, options) for dev in devices]))
 
   err_msg = CheckForMissingDevices(options, devices) or []
 
   unique_types = list(set(types))
@@ skipping 30 matching lines @@
     # devices with critically low battery. 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())