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

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 pylib.android_commands
 from pylib.device import adb_wrapper
+from pylib.device import decorators
 
 
-def GetAVDs():
+_DEFAULT_TIMEOUT = 30
+_DEFAULT_RETRIES = 3
+
+
+_WithTimeoutAndRetries = decorators.WithTimeoutAndRetries

[craigdh, 2014/05/13 15:46:24]

This additional level of indirection is confusing. If you really don't want to
use the full module name just do something like "from pylib.device import
decorators as D".

[bulach, 2014/05/13 16:14:40]

gargh! :D
ok, rant #271 :)
these "translations" just make it much harder to follow, and save maybe a one
line with extra indent ;)
see "H(..)", "T(...)" and friends in the buildbot steps..
as you probably have guessed my opinion by now, keep it explicit. :)

[craigdh, 2014/05/13 16:18:18]

I'm 100% with Marcus on this one.

+_WithTimeoutAndRetriesDefaults = decorators.WithTimeoutAndRetriesDefaults
+_WithTimeoutAndRetriesFromInstance = (
+    decorators.WithTimeoutAndRetriesFromInstance('_default_timeout',
+                                                 '_default_retries'))
+
+
+@_WithTimeoutAndRetriesDefaults(_DEFAULT_TIMEOUT, _DEFAULT_RETRIES)
+def GetAVDs(timeout=None, retries=None):

[bulach, 2014/05/13 16:14:40]

is there any client passing these args in any sensible way? if not, remove it
from the function definition, and just use the _DEFAULT values via the decorator
(ditto for the one below)...
should anybody ever need to change these values in one particular call, we'd
then add these parameters again.

+  """ Returns a list of Android Virtual Devices.
+
+  Args:
+    timeout: The length of time to wait before giving up on either killing or
+             restarting the server.
+    retries: The number of times to retry either killing or restarting the
+             server.
+  Returns:
+    A list containing the configured AVDs.
+  """
   return pylib.android_commands.GetAVDs()
 
 
+@_WithTimeoutAndRetriesDefaults(_DEFAULT_TIMEOUT, _DEFAULT_RETRIES)
+def RestartServer(timeout=None, retries=None):
+  """ Restarts the adb server.
+
+  Args:
+    timeout: The length of time to wait before giving up on either killing or
+             restarting the server.
+    retries: The number of times to retry either killing or restarting the
+             server.
+  Raises:
+    CommandFailedError if we fail to kill or restart the server.
+  """
+  pylib.android_commands.AndroidCommands().RestartAdbServer()
+
+
 class DeviceUtils(object):
 
   def __init__(self, device):
     self.old_interface = None
     if isinstance(device, basestring):
       self.old_interface = pylib.android_commands.AndroidCommands(device)
     elif isinstance(device, adb_wrapper.AdbWrapper):
       self.old_interface = pylib.android_commands.AndroidCommands(str(device))
     elif isinstance(device, pylib.android_commands.AndroidCommands):
       self.old_interface = device
     elif not device:
       self.old_interface = pylib.android_commands.AndroidCommands()