[Android] Switch to new interfaces of GetAVDs and RestartAdbServer.

build/android/pylib/device/adb_wrapper.py

 # 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.
 
 """This module wraps Android's adb tool.
 
 This is a thin wrapper around the adb interface. Any additional complexity
 should be delegated to a higher level (ex. DeviceUtils).
 """
 
 import errno
 import os
 
 from pylib import cmd_helper
+from pylib.device import decorators
+from pylib.device import device_errors
 
-from pylib.utils import reraiser_thread
-from pylib.utils import timeout_retry
 
 _DEFAULT_TIMEOUT = 30
 _DEFAULT_RETRIES = 2
 
 
-class BaseError(Exception):
-  """Base exception for all device and command errors."""
-  pass
+BaseError = device_errors.BaseError

[craigdh, 2014/05/13 16:59:42]

I don't like this either. Exceptions raised from different modules are actually
equal? That could lead to very confusing try/except behavior. Let people
reference these directly from their real module.

+CommandFailedError = device_errors.CommandFailedError
+CommandTimeoutError = device_errors.CommandTimeoutError
+DeviceUnreachableError = device_errors.DeviceUnreachableError
 
 
-class CommandFailedError(BaseError):
-  """Exception for command failures."""
-
-  def __init__(self, cmd, msg, device=None):
-    super(CommandFailedError, self).__init__(
-        (('device %s: ' % device) if device else '') +
-        'adb command \'%s\' failed with message: \'%s\'' % (' '.join(cmd), msg))
-
-
-class CommandTimeoutError(BaseError):
-  """Exception for command timeouts."""
-  pass
-
-
-class DeviceUnreachableError(BaseError):
-  """Exception for device unreachable failures."""
-  pass
-
 def _VerifyLocalFileExists(path):
   """Verifies a local file exists.
 
   Args:
     path: Path to the local file.
 
   Raises:
     IOError: If the file doesn't exist.
   """
   if not os.path.exists(path):
     raise IOError(errno.ENOENT, os.strerror(errno.ENOENT), path)
 
 
 class AdbWrapper(object):
   """A wrapper around a local Android Debug Bridge executable."""
 
   def __init__(self, device_serial):
     """Initializes the AdbWrapper.
 
     Args:
       device_serial: The device serial number as a string.
     """
     self._device_serial = str(device_serial)
 
+  # pylint: disable=W0613
   @classmethod
-  def _AdbCmd(cls, arg_list, timeout, retries, check_error=True):
-    """Runs an adb command with a timeout and retries.
-
-    Args:
-      arg_list: A list of arguments to adb.
-      timeout: Timeout in seconds.
-      retries: Number of retries.
-      check_error: Check that the command doesn't return an error message. This
-        does NOT check the return code of shell commands.
-
-    Returns:
-      The output of the command.
-    """
+  @decorators.WithTimeoutAndRetries
+  def _RunAdbCmd(cls, arg_list, timeout=None, retries=None, check_error=True):
     cmd = ['adb'] + arg_list
-
-    # This method runs inside the timeout/retries.
-    def RunCmd():
-      exit_code, output = cmd_helper.GetCmdStatusAndOutput(cmd)
-      if exit_code != 0:
-        raise CommandFailedError(
-            cmd, 'returned non-zero exit code %s, output: %s' %
-            (exit_code, output))
-      # This catches some errors, including when the device drops offline;
-      # unfortunately adb is very inconsistent with error reporting so many
-      # command failures present differently.
-      if check_error and output[:len('error:')] == 'error:':
-        raise CommandFailedError(arg_list, output)
-      return output
-
-    try:
-      return timeout_retry.Run(RunCmd, timeout, retries)
-    except reraiser_thread.TimeoutError as e:
-      raise CommandTimeoutError(str(e))
+    exit_code, output = cmd_helper.GetCmdStatusAndOutput(cmd)
+    if exit_code != 0:
+      raise CommandFailedError(
+          cmd, 'returned non-zero exit code %s, output: %s' %
+          (exit_code, output))
+    # This catches some errors, including when the device drops offline;
+    # unfortunately adb is very inconsistent with error reporting so many
+    # command failures present differently.
+    if check_error and output[:len('error:')] == 'error:':
+      raise CommandFailedError(arg_list, output)
+    return output
+  # pylint: enable=W0613
 
   def _DeviceAdbCmd(self, arg_list, timeout, retries, check_error=True):
     """Runs an adb command on the device associated with this object.
 
     Args:
       arg_list: A list of arguments to adb.
       timeout: Timeout in seconds.
       retries: Number of retries.
       check_error: Check that the command doesn't return an error message. This
         does NOT check the return code of shell commands.
 
     Returns:
       The output of the command.
     """
-    return self._AdbCmd(
-        ['-s', self._device_serial] + arg_list, timeout, retries,
-        check_error=check_error)
+    return self._RunAdbCmd(
+        ['-s', self._device_serial] + arg_list, timeout=timeout,
+        retries=retries, check_error=check_error)
 
   def __eq__(self, other):
     """Consider instances equal if they refer to the same device.
 
     Args:
       other: The instance to compare equality with.
 
     Returns:
       True if the instances are considered equal, false otherwise.
     """
@@ skipping 15 matching lines @@
   def GetDevices(cls, timeout=_DEFAULT_TIMEOUT, retries=_DEFAULT_RETRIES):
     """Get the list of active attached devices.
 
     Args:
       timeout: (optional) Timeout per try in seconds.
       retries: (optional) Number of retries to attempt.
 
     Yields:
       AdbWrapper instances.
     """
-    output = cls._AdbCmd(['devices'], timeout, retries)
+    output = cls._RunAdbCmd(['devices'], timeout=timeout, retries=retries)
     lines = [line.split() for line in output.split('\n')]
     return [AdbWrapper(line[0]) for line in lines
             if len(line) == 2 and line[1] == 'device']
 
   def GetDeviceSerial(self):
     """Gets the device serial number associated with this object.
 
     Returns:
       Device serial number as a string.
     """
@@ skipping 250 matching lines @@
     """Restarts the adbd daemon with root permissions, if possible.
 
     Args:
       timeout: (optional) Timeout per try in seconds.
       retries: (optional) Number of retries to attempt.
     """
     output = self._DeviceAdbCmd(['root'], timeout, retries)
     if 'cannot' in output:
       raise CommandFailedError(['root'], output)