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

build/android/pylib/device/device_utils_test.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.
 
 """
 Unit tests for the contents of device_utils.py (mostly DeviceUtils).
 """
 
 # pylint: disable=W0212
 # pylint: disable=W0613
 
 import random
+import time
 import unittest
 
 from pylib import android_commands
 from pylib import cmd_helper
 from pylib.device import adb_wrapper
 from pylib.device import device_errors
 from pylib.device import device_utils
 
 
 class DeviceUtilsTest(unittest.TestCase):
@@ skipping 40 matching lines @@
     d = device_utils.DeviceUtils(a)
     self.assertEqual(serial, d.old_interface.GetDevice())
 
   def testInitWithNone(self):
     d = device_utils.DeviceUtils(None)
     self.assertIsNone(d.old_interface.GetDevice())
 
   @staticmethod
   def _getTestAdbWrapper():
     devices = adb_wrapper.AdbWrapper.GetDevices()
-    if devices:
-      return random.choice(devices)
-    return None
+    start_time = time.time()
+    while time.time() - start_time < device_utils._DEFAULT_TIMEOUT:
+      if devices:
+        return random.choice(devices)
+      time.sleep(1)
+    raise device_errors.DeviceUnreachableError(
+        'No devices available for testing...')
 
   @staticmethod
   def _getUnusedSerial():
     used_devices = [str(d) for d in adb_wrapper.AdbWrapper.GetDevices()]
     while True:
       serial = ''
       for _ in xrange(0, 16):
         serial += random.choice('0123456789abcdef')
       if serial not in used_devices:
         return serial
@@ skipping 50 matching lines @@
         self.assertTrue(d.HasRoot())
       else:
         self.assertFalse(d.HasRoot())
         with self.assertRaises(device_errors.CommandFailedError):
           d.EnableRoot()
     else:
       self.assertTrue(d.HasRoot())
       d.EnableRoot()
       self.assertTrue(d.HasRoot())
 
+  def testGetExternalStorage(self):
+    a = self._getTestAdbWrapper()
+    d = device_utils.DeviceUtils(a)
+
+    actual_external_storage = a.Shell('echo $EXTERNAL_STORAGE').splitlines()[0]
+    if actual_external_storage and len(actual_external_storage) != 0:
+      self.assertEquals(actual_external_storage, d.GetExternalStoragePath())
+
+  def testWaitUntilFullyBooted(self):
+    a = self._getTestAdbWrapper()
+    d = device_utils.DeviceUtils(a)
+
+    a.Reboot()
+    while a.GetState() == 'device':
+      time.sleep(0.1)
+    d.WaitUntilFullyBooted(wifi=True)
+    self.assertEquals(
+        '1', a.Shell('getprop sys.boot_completed').splitlines()[0])
+    self.assertTrue(
+        a.Shell('pm path android').splitlines()[0].startswith('package:'))
+    self.assertTrue(a.Shell('ls $EXTERNAL_STORAGE'))
+    self.assertTrue(
+        'Wi-Fi is enabled' in a.Shell('dumpsys wifi').splitlines())
+
 
 if __name__ == '__main__':
   unittest.main(verbosity=2, buffer=True)