[devil] Allow instantiation of AdbWrapper with USB bus identifer.

devil/devil/android/sdk/adb_wrapper_test.py

Index: devil/devil/android/sdk/adb_wrapper_test.py
diff --git a/devil/devil/android/sdk/adb_wrapper_test.py b/devil/devil/android/sdk/adb_wrapper_test.py
index ef08661208d8fe96e28cdda09dadcca79f16d478..9ea420a8dd63710db9ed08087f4f8c5c06886804 100755
--- a/devil/devil/android/sdk/adb_wrapper_test.py
+++ b/devil/devil/android/sdk/adb_wrapper_test.py
@@ -17,43 +17,89 @@ with devil_env.SysPath(devil_env.PYMOCK_PATH):
   import mock  # pylint: disable=import-error
 
 
+def MockRunDeviceAdbCmd(adb, return_value):
+  return mock.patch.object(
+    adb,
+    '_RunDeviceAdbCmd',

[rnephew (Reviews Here), 2017/05/30 20:15:05]

This is the method that has its return value mocked out.

+    mock.Mock(side_effect=None, return_value=return_value))
+
+
 class AdbWrapperTest(unittest.TestCase):
   def setUp(self):
-    self.adb = adb_wrapper.AdbWrapper('ABC12345678')
-
-  def _MockRunDeviceAdbCmd(self, return_value):
-    return mock.patch.object(
-        self.adb,
-        '_RunDeviceAdbCmd',
-        mock.Mock(side_effect=None, return_value=return_value))
+    self.adb_wrappers = [
+      adb_wrapper.AdbWrapper('ABC12345678'),
+      adb_wrapper.AdbWrapper('usb:1-2.3'),
+    ]
 
   def testDisableVerityWhenDisabled(self):
-    with self._MockRunDeviceAdbCmd('Verity already disabled on /system'):
-      self.adb.DisableVerity()
+    return_value = 'Verity already disabled on /system'
+    for adb in self.adb_wrappers:
+      with MockRunDeviceAdbCmd(adb, return_value):
+        adb.DisableVerity()
 
   def testDisableVerityWhenEnabled(self):
-    with self._MockRunDeviceAdbCmd(
-        'Verity disabled on /system\nNow reboot your device for settings to '
-        'take effect'):
-      self.adb.DisableVerity()
+    return_value = 'Verity disabled on /system\nNow reboot your device for ' \
+                   'settings to take effect'
+    for adb in self.adb_wrappers:
+      with MockRunDeviceAdbCmd(adb, return_value):
+        adb.DisableVerity()
 
   def testEnableVerityWhenEnabled(self):
-    with self._MockRunDeviceAdbCmd('Verity already enabled on /system'):
-      self.adb.EnableVerity()
+    return_value = 'Verity already enabled on /system'
+    for adb in self.adb_wrappers:
+      with MockRunDeviceAdbCmd(adb, return_value):
+        adb.EnableVerity()
 
   def testEnableVerityWhenDisabled(self):
-    with self._MockRunDeviceAdbCmd(
-        'Verity enabled on /system\nNow reboot your device for settings to '
-        'take effect'):
-      self.adb.EnableVerity()
+    return_value = 'Verity enabled on /system\nNow reboot your device for ' \
+               'settings to take effect'
+    for adb in self.adb_wrappers:
+      with MockRunDeviceAdbCmd(adb, return_value):
+        adb.EnableVerity()
 
   def testFailEnableVerity(self):
-    with self._MockRunDeviceAdbCmd('error: closed'):
-      self.assertRaises(
-          device_errors.AdbCommandFailedError, self.adb.EnableVerity)
+    return_value = 'error: closed'
+    for adb in self.adb_wrappers:
+      with MockRunDeviceAdbCmd(adb, return_value):
+        self.assertRaises(device_errors.AdbCommandFailedError, adb.EnableVerity)
 
   def testFailDisableVerity(self):
-    with self._MockRunDeviceAdbCmd('error: closed'):
-      self.assertRaises(
-          device_errors.AdbCommandFailedError, self.adb.DisableVerity)
+    return_value = 'error: closed'
+    for adb in self.adb_wrappers:
+      with MockRunDeviceAdbCmd(adb, return_value):
+        self.assertRaises(device_errors.AdbCommandFailedError,
+                          adb.DisableVerity)
+
+  def testGetStateOnline(self):
+    return_value = 'device'
+    for adb in self.adb_wrappers:
+      with MockRunDeviceAdbCmd(adb, return_value):
+        adb.GetState()
+
+  def testGetStateOffline(self):
+    return_value = 'offline'
+    for adb in self.adb_wrappers:
+      with MockRunDeviceAdbCmd(adb, return_value):
+        adb.GetState()
+
+  def testGetStateUnauthorized(self):
+    return_value = 'unauthorized'
+    for adb in self.adb_wrappers:
+      with MockRunDeviceAdbCmd(adb, return_value):
+        adb.GetState()
+
+  def testGetStateBootloader(self):
+    return_value = 'bootloader'
+    for adb in self.adb_wrappers:
+      with MockRunDeviceAdbCmd(adb, return_value):
+        adb.GetState()
+
+  def testGetStateNoPermissions(self):
+    return_value = 'no' # as in 'no permissions'
+    for adb in self.adb_wrappers:
+      with MockRunDeviceAdbCmd(adb, return_value):
+        adb.GetState()
+
 
+if __name__ == '__main__':
+  unittest.main()