[Android] Switch to DeviceUtils versions of Reboot and Install.

build/android/pylib/device/device_utils.py

 # Copyright 2014 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.
 
 """
 Provides a variety of device interactions based on adb.
 
 Eventually, this will be based on adb_wrapper.
 """
 # pylint: disable=W0613
 
 import time
 
 import pylib.android_commands
 from pylib.device import adb_wrapper
 from pylib.device import decorators
 from pylib.device import device_errors
+from pylib.utils import apk_helper
 from pylib.utils import parallelizer
 
 _DEFAULT_TIMEOUT = 30
 _DEFAULT_RETRIES = 3
 
 
 @decorators.WithExplicitTimeoutAndRetries(
     _DEFAULT_TIMEOUT, _DEFAULT_RETRIES)
 def GetAVDs():
   """ Returns a list of Android Virtual Devices.
@@ skipping 119 matching lines @@
       DeviceUnreachableError if the device becomes unresponsive.
     """
     self.old_interface.WaitForSystemBootCompleted(timeout)
     self.old_interface.WaitForDevicePm()
     self.old_interface.WaitForSdCardReady(timeout)
     if wifi:
       while not 'Wi-Fi is enabled' in (
           self.old_interface.RunShellCommand('dumpsys wifi')):
         time.sleep(0.1)
 
+  @decorators.WithTimeoutAndRetriesFromInstance()
+  def Reboot(self, block=True, timeout=None, retries=None):
+    """ Reboot the device.

[frankf, 2014/05/24 00:22:39]

no space after quotation mark. Also you didn't fix the onliner docstring from
before :)

[jbudorick, 2014/05/27 20:58:35]

Done wrt no space. There's only one one liner docstring in this file, and it
follows the convention you specified...?

[frankf, 2014/05/27 21:12:10]

Multi-line:

"""Line One.

Line2.
"""

Single line:

"""Blah."""

Note there's no space between quotation mark and first word.

On 2014/05/27 20:58:35, jbudorick wrote:

[jbudorick, 2014/05/27 21:44:14]

Right, my point was that all of the docstrings in this file were already
following that convention aside from the no space thing. (In the current
revision of this CL, they follow that as well.)

+
+    Args:
+      block: A boolean indicating if we should wait for the reboot to complete.
+      timeout: Same as for |IsOnline|.
+      retries: Same as for |IsOnline|.
+    """
+    self.old_interface.Reboot()
+    if block:
+      self.WaitUntilFullyBooted()
+
+  @decorators.WithTimeoutAndRetriesDefaults(
+      4 * _DEFAULT_TIMEOUT,
+      _DEFAULT_RETRIES)
+  def Install(self, apk_path, timeout=None, retries=None):
+    """ Install an APK. Noop if an identical APK is already installed.
+
+    Args:
+      apk_path: A string containing the path to the APK to install.
+      timeout: Same as for |IsOnline|.
+      retries: Same as for |IsOnline|.
+    Raises:
+      CommandFailedError if the installation fails.
+      CommandTimeoutError if the installation times out.
+    """
+    package_name = apk_helper.GetPackageName(apk_path)
+    device_path = self.old_interface.GetApplicationPath(package_name)
+    if not device_path or len(self.old_interface.GetFilesChanged(
+        apk_path, device_path, ignore_filenames=True) > 0):

[frankf, 2014/05/24 00:22:39]

I'd create a variable to hold len(...) to make this more readable

[jbudorick, 2014/05/27 20:58:35]

Done.

+      try:
+        if device_path:
+          self.old_interface.Uninstall(package_name)
+        out = self.old_interface.Install(apk_path, reinstall=bool(device_path))
+        for line in out.split('\n'):
+          if 'Failure' in line:
+            raise device_errors.CommandFailedError(
+                ['adb' ,'install', apk_path], line.strip())
+      except AssertionError as e:
+        raise device_errors.CommandFailedError(str(e))
+
   def __str__(self):
     """Returns the device serial."""
     return self.old_interface.GetDevice()
 
   @staticmethod
   def parallel(devices=None, async=False):
     """ Creates a Parallelizer to operate over the provided list of devices.
 
     If |devices| is either |None| or an empty list, the Parallelizer will
     operate over all attached devices.
 
     Args:
       devices: A list of either DeviceUtils instances or objects from
                from which DeviceUtils instances can be constructed. If None,
                all attached devices will be used.
       async: If true, returns a Parallelizer that runs operations
              asynchronously.
     Returns:
       A Parallelizer operating over |devices|.
     """
     if not devices or len(devices) == 0:
       devices = pylib.android_commands.GetAttachedDevices()
     parallelizer_type = (parallelizer.Parallelizer if async
                          else parallelizer.SyncParallelizer)
     return parallelizer_type([
         d if isinstance(d, DeviceUtils) else DeviceUtils(d)
         for d in devices])