Add option to specify ADB binary in test runner.

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 197 matching lines @@
   def assertNoAdbCalls(self):
     return type(self).AndroidCommandsCalls(self, [], str.__eq__)
 
   def assertCalls(self, cmd, ret, comp=str.__eq__):
     return type(self).AndroidCommandsCalls(self, [(cmd, ret)], comp)
 
   def assertCallsSequence(self, cmd_ret, comp=str.__eq__):
     return type(self).AndroidCommandsCalls(self, cmd_ret, comp)
 
   def setUp(self):
-    self.device = device_utils.DeviceUtils(
-        '0123456789abcdef', default_timeout=1, default_retries=0)
+    with mock.patch('pylib.constants.GetAdbPath',

[jbudorick, 2014/11/19 19:58:46]

why not patch it in setUp and unpatch it in tearDown? (which you'd have to add)

You wouldn't have to worry about patching it in the tests below.

+                    mock.Mock(return_value='adb')):
+      self.device = device_utils.DeviceUtils(
+          '0123456789abcdef', default_timeout=1, default_retries=0)
 
 
 class DeviceUtilsNewImplTest(mock_calls.TestCase):
 
   def setUp(self):
     test_serial = '0123456789abcdef'
     self.adb = mock.Mock(spec=adb_wrapper.AdbWrapper)
     self.adb.__str__ = mock.Mock(return_value=test_serial)
     self.adb.GetDeviceSerial.return_value = test_serial
     self.device = device_utils.DeviceUtils(
@@ skipping 1371 matching lines @@
       self.assertEqual({}, self.device.GetMemoryUsageForPid(4321))
 
 
 class DeviceUtilsStrTest(DeviceUtilsOldImplTest):
 
   def testStr_noAdbCalls(self):
     with self.assertNoAdbCalls():
       self.assertEqual('0123456789abcdef', str(self.device))
 
   def testStr_noSerial(self):
-    self.device = device_utils.DeviceUtils(None)
+    with mock.patch('pylib.constants.GetAdbPath',
+                    mock.Mock(return_value='adb')):
+      self.device = device_utils.DeviceUtils(None)
     with self.assertCalls('adb  get-serialno', '0123456789abcdef'):
       self.assertEqual('0123456789abcdef', str(self.device))
 
   def testStr_noSerial_noDevices(self):
-    self.device = device_utils.DeviceUtils(None)
+    with mock.patch('pylib.constants.GetAdbPath',
+                    mock.Mock(return_value='adb')):
+      self.device = device_utils.DeviceUtils(None)
     with self.assertCalls('adb  get-serialno', 'unknown'), (
          self.assertRaises(device_errors.NoDevicesError)):
       str(self.device)
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)