[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):

[rnephew (Reviews Here), 2017/05/30 18:21:12]

Any reason why this was moved to the module level from the AdbWrapperTest class?

[kavefish, 2017/05/30 19:27:20]

Only one: after I refactored MockRunDeviceAdbCmd() to take an AdbWrapper as an
argument rather than always using self.adb, a presubmit check complained that
this method should be a function because it no longer referred to self. 

[rnephew (Reviews Here), 2017/05/30 19:40:32]

Ah. In the future you can also just make it a static method.
https://cs.chromium.org/chromium/src/third_party/catapult/devil/devil/android...

But its fine as is. Was just more curious than anything else.

+  return mock.patch.object(
+    adb,
+    '_RunDeviceAdbCmd',
+    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'

[rnephew (Reviews Here), 2017/05/30 18:21:12]

Is this output representative of what we would see in real use?

[kavefish, 2017/05/30 19:27:20]

Not sure if you're asking me, but I'll do my best to answer. 

In short, I believe so. The possible return values of GetState() weren't changed
by this CL. I just documented a couple more that I was aware of by noting them
in the comments and then added test cases for them here. 

These aren't very interesting tests though, which is partly because GetState()
isn't very interesting in isolation. 

[rnephew (Reviews Here), 2017/05/30 19:40:32]

I just thought that the return value from adb we would want would be the output
from this line:
 839     lines = self._RawDevices(timeout=timeout, retries=retries,
long_list=True)
Which runs adb devices -l

I might be misunderstanding what adb call this is mocking out though.

+    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()