[Android] Convert to DeviceUtils versions of WaitUntilFullyBooted and GetExternalStoragePath.

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 multiprocessing
 import os
 import sys
+import time
 
 import pylib.android_commands
 from pylib.device import adb_wrapper
 from pylib.device import decorators
 from pylib.device import device_errors
 
 CHROME_SRC_DIR = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..', '..'))
 sys.path.append(os.path.join(
     CHROME_SRC_DIR, 'third_party', 'android_testrunner'))
@@ skipping 118 matching lines @@
     Args:
       timeout: Same as for |IsOnline|.
       retries: Same as for |IsOnline|.
     Raises:
       CommandFailedError if root could not be enabled.
     """
     if not self.old_interface.EnableAdbRoot():
       raise device_errors.CommandFailedError(
           'adb root', 'Could not enable root.')
 
+  @decorators.WithTimeoutAndRetriesFromInstance(
+      '_default_timeout', '_default_retries')
+  def GetExternalStoragePath(self, timeout=None, retries=None):
+    """ Get the device's path to its SD card.
+
+    Args:
+      timeout: Same as for |IsOnline|.
+      retries: Same as for |IsOnline|.
+    Returns:
+      The device's path to its SD card.
+    """
+    try:
+      return self.old_interface.GetExternalStorage()
+    except AssertionError as e:
+      raise device_errors.CommandFailedError(str(e))
+
+  @decorators.WithTimeoutAndRetriesFromInstance(
+      '_default_timeout', '_default_retries')

[craigdh, 2014/05/21 22:25:00]

duplicated strings should be module level constants

[jbudorick, 2014/05/22 04:49:58]

Wound up doing what you suggested on the last CL - defaulting to
'_default_timeout' and '_default_retries' in the decorator.

+  def WaitUntilFullyBooted(self, wifi=False, timeout=None, retries=None):
+    """ Wait for the device to fully boot.
+
+    This means waiting for the device to boot, the package manager to be
+    available, and the SD card to be ready. It can optionally mean waiting
+    for wifi to come up, too.
+
+    Args:
+      wifi: A boolean indicating if we should wait for wifi to come up or not.
+      timeout: Same as for |IsOnline|.
+      retries: Same as for |IsOnline|.
+    Raises:
+      CommandTimeoutError if one of the component waits times out.
+      DeviceUnreachableError if the device becomes unresponsive.
+    """
+    try:
+      self.old_interface.WaitForSystemBootCompleted(timeout)
+      self.old_interface.WaitForDevicePm()
+      self.old_interface.WaitForSdCardReady(timeout)
+      if wifi:
+        wifi_enabled = False

[craigdh, 2014/05/21 22:25:00]

these five lines can be just two:

while 'Wi-Fi is enabled' not in self.old_interface.RunShellCommand('dumpsys
wifi'):
  time.sleep(0.1)

[jbudorick, 2014/05/22 04:49:58]

Done, though sadly it doesn't fit in 80 characters.

+        while not wifi_enabled:
+          wifi_results = self.old_interface.RunShellCommand('dumpsys wifi')
+          wifi_enabled = 'Wi-Fi is enabled' in wifi_results
+          time.sleep(0.1)
+    except errors.DeviceUnresponsiveError as e:
+      raise device_errors.DeviceUnreachableError(str(e))
+    except errors.WaitForResponseTimedOutError as e:
+      raise device_errors.CommandTimeoutError(str(e))
+