Add a workaround for broken adb get-state call.

build/android/pylib/device/device_utils_test.py

 #!/usr/bin/env python
 # 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=C0321
@@ skipping 124 matching lines @@
     return type(self).AndroidCommandsCalls(self, cmd_ret, comp)
 
   def setUp(self):
     self.device = device_utils.DeviceUtils(
         '0123456789abcdef', default_timeout=1, default_retries=0)
 
 
 class DeviceUtilsIsOnlineTest(DeviceUtilsOldImplTest):
 
   def testIsOnline_true(self):
-    with self.assertCalls('adb -s 0123456789abcdef get-state',
-                                 'device\r\n'):
+    with self.assertCalls('adb -s 0123456789abcdef devices',
+                                 '00123456789abcdef  device\r\n'):
       self.assertTrue(self.device.IsOnline())
 
   def testIsOnline_false(self):
-    with self.assertCalls('adb -s 0123456789abcdef get-state', '\r\n'):
+    with self.assertCalls('adb -s 0123456789abcdef devices', '\r\n'):
       self.assertFalse(self.device.IsOnline())
 
 
 class DeviceUtilsHasRootTest(DeviceUtilsOldImplTest):
 
   def testHasRoot_true(self):
     with self.assertCalls("adb -s 0123456789abcdef shell 'ls /root'",
                                  'foo\r\n'):
       self.assertTrue(self.device.HasRoot())
 
@@ skipping 141 matching lines @@
         with self.assertRaises(device_errors.CommandTimeoutError):
           self.device.WaitUntilFullyBooted(wifi=False)
 
 
 class DeviceUtilsRebootTest(DeviceUtilsOldImplTest):
 
   def testReboot_nonBlocking(self):
     with mock.patch('time.sleep'):
       with self.assertCallsSequence([
             ('adb -s 0123456789abcdef reboot', ''),
-            ('adb -s 0123456789abcdef get-state', 'unknown\r\n'),
+            ('adb -s 0123456789abcdef devices', 'unknown\r\n'),
             ('adb -s 0123456789abcdef wait-for-device', ''),
             ('adb -s 0123456789abcdef shell pm path android',
              'package:this.is.a.test.package'),
             ("adb -s 0123456789abcdef shell 'echo $EXTERNAL_STORAGE'",
              '/fake/storage/path\r\n'),
             ("adb -s 0123456789abcdef shell 'ls /fake/storage/path'",
              'nothing\r\n')]):
         self.device.Reboot(block=False)
 
   def testReboot_blocking(self):
     with mock.patch('time.sleep'):
       with self.assertCallsSequence([
             ('adb -s 0123456789abcdef reboot', ''),
-            ('adb -s 0123456789abcdef get-state', 'unknown\r\n'),
+            ('adb -s 0123456789abcdef devices', 'unknown\r\n'),
             ('adb -s 0123456789abcdef wait-for-device', ''),
             ('adb -s 0123456789abcdef shell pm path android',
              'package:this.is.a.test.package'),
             ("adb -s 0123456789abcdef shell 'echo $EXTERNAL_STORAGE'",
              '/fake/storage/path\r\n'),
             ("adb -s 0123456789abcdef shell 'ls /fake/storage/path'",
              'nothing\r\n'),
             ('adb -s 0123456789abcdef wait-for-device', ''),
             ('adb -s 0123456789abcdef shell getprop sys.boot_completed',
              '1\r\n'),
@@ skipping 1016 matching lines @@
         'adb -s 0123456789abcdef shell '
             'setprop this.is.a.test.property "test_property_value"',
         ''):
       self.device.SetProp('this.is.a.test.property', 'test_property_value')
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)