Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5350)

Unified Diff: build/android/pylib/device/device_utils_test.py

Issue 1088793002: [Android] Remove android_commands uses from build/android/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: docstrings for device_filter.py Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/android/pylib/device/device_utils_test.py
diff --git a/build/android/pylib/device/device_utils_test.py b/build/android/pylib/device/device_utils_test.py
index fb91daa41e24445ddc9991164ba20245c0740308..6e1ee9e34ee3bffd5495164944ce9928c27d648d 100755
--- a/build/android/pylib/device/device_utils_test.py
+++ b/build/android/pylib/device/device_utils_test.py
@@ -1492,9 +1492,10 @@ class DeviceUtilsParallelTest(mock_calls.TestCase):
def testParallel_default(self):
test_serials = ['0123456789abcdef', 'fedcba9876543210']
- with self.assertCall(
- mock.call.pylib.device.adb_wrapper.AdbWrapper.GetDevices(),
- [_AdbWrapperMock(serial) for serial in test_serials]):
+ with self.assertCalls(
+ (mock.call.pylib.device.device_filter.DefaultFilters(), None),
+ (mock.call.pylib.device.adb_wrapper.AdbWrapper.Devices(filters=None),
+ [_AdbWrapperMock(serial) for serial in test_serials])):
parallel_devices = device_utils.DeviceUtils.parallel()
for serial, device in zip(test_serials, parallel_devices.pGet(None)):
self.assertTrue(
@@ -1503,8 +1504,10 @@ class DeviceUtilsParallelTest(mock_calls.TestCase):
'Expected a DeviceUtils object with serial %s' % serial)
def testParallel_noDevices(self):
- with self.assertCall(
- mock.call.pylib.device.adb_wrapper.AdbWrapper.GetDevices(), []):
+ with self.assertCalls(
+ (mock.call.pylib.device.device_filter.DefaultFilters(), None),
+ (mock.call.pylib.device.adb_wrapper.AdbWrapper.Devices(filters=None),
+ [])):
with self.assertRaises(device_errors.NoDevicesError):
device_utils.DeviceUtils.parallel()
« no previous file with comments | « build/android/pylib/device/device_utils.py ('k') | build/android/pylib/local/device/local_device_environment.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698