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

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 functools
 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
 
 
+def TestRequiresDevice(f):
+  @functools.wraps(f)
+  def wrapper(*args, **kwargs):
+    if len(adb_wrapper.AdbWrapper.GetDevices()) > 0:
+      return f(*args, **kwargs)
+    return unittest.skip('Test requires an attached device.')
+  return wrapper
+
+
 class DeviceUtilsTest(unittest.TestCase):
   def testGetAVDs(self):
     pass
 
+  @TestRequiresDevice
   def testRestartServerNotRunning(self):
     self.assertEqual(0, cmd_helper.RunCmd(['pkill', 'adb']),
                      msg='Unable to kill adb during setup.')
     self.assertNotEqual(0, cmd_helper.RunCmd(['pgrep', 'adb']),
                         msg='Unexpectedly found adb during setup.')
     device_utils.RestartServer()
     self.assertEqual(0, cmd_helper.RunCmd(['pgrep', 'adb']))
 
+  @TestRequiresDevice
   def testRestartServerAlreadyRunning(self):
     if cmd_helper.RunCmd(['pgrep', 'adb']) != 0:
       device_utils.RestartServer()
     code, original_pid = cmd_helper.GetCmdStatusAndOutput(['pgrep', 'adb'])
     self.assertEqual(0, code)
     device_utils.RestartServer()
     code, new_pid = cmd_helper.GetCmdStatusAndOutput(['pgrep', 'adb'])
     self.assertEqual(0, code)
     self.assertNotEqual(original_pid, new_pid)
 
@@ skipping 37 matching lines @@
   @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
 
+  @TestRequiresDevice
   def testIsOnline(self):
     d = device_utils.DeviceUtils(self._getTestAdbWrapper())
     self.assertTrue(d is None or d.IsOnline())
     d = device_utils.DeviceUtils(self._getUnusedSerial())
     self.assertFalse(d.IsOnline())
 
+  @TestRequiresDevice
   def testHasRoot(self):
     a = self._getTestAdbWrapper()
     d = device_utils.DeviceUtils(a)
     secure_prop = a.Shell('getprop ro.secure').strip()
     if secure_prop == '1':
       build_type_prop = a.Shell('getprop ro.build.type').strip()
       if build_type_prop == 'userdebug':
         adb_root_prop = a.Shell('getprop service.adb.root').strip()
         if adb_root_prop is None or adb_root_prop == '0':
           self.assertFalse(d.HasRoot())
         else:
           self.assertTrue(d.HasRoot())
       else:
         self.assertFalse(d.HasRoot())
     else:
       self.assertTrue(d.HasRoot())
 
+  @TestRequiresDevice
   def testEnableRoot(self):
     a = self._getTestAdbWrapper()
     d = device_utils.DeviceUtils(a)
 
     secure_prop = a.Shell('getprop ro.secure').strip()
     if secure_prop == '1':
       build_type_prop = a.Shell('getprop ro.build.type').strip()
       if build_type_prop == 'userdebug':
         # Turn off the adb root property
         adb_root_prop = a.Shell('getprop service.adb.root').strip()
@@ skipping 16 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())
 
+  @TestRequiresDevice
   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())
 
+  @TestRequiresDevice
   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())
 
+  @TestRequiresDevice
+  def testBlockingReboot(self):
+    a = self._getTestAdbWrapper()
+    d = device_utils.DeviceUtils(a)
+
+    old_boot_time = a.Shell('getprop ro.runtime.firstboot').strip()
+    if old_boot_time and len(old_boot_time):
+      d.Reboot(block=True, timeout=120)
+      self.assertNotEquals(old_boot_time,
+                           a.Shell('getprop ro.runtime.firstboot').strip())
+      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'))
+    else:
+      self.skipTest("No 'ro.runtime.firstboot' property on %s." % str(a))
+
 
 if __name__ == '__main__':
-  unittest.main(verbosity=2, buffer=True)
+  unittest.main(verbosity=2)