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 6e1ee9e34ee3bffd5495164944ce9928c27d648d..fb91daa41e24445ddc9991164ba20245c0740308 100755 |
--- a/build/android/pylib/device/device_utils_test.py |
+++ b/build/android/pylib/device/device_utils_test.py |
@@ -1492,10 +1492,9 @@ |
def testParallel_default(self): |
test_serials = ['0123456789abcdef', 'fedcba9876543210'] |
- 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])): |
+ with self.assertCall( |
+ mock.call.pylib.device.adb_wrapper.AdbWrapper.GetDevices(), |
+ [_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( |
@@ -1504,10 +1503,8 @@ |
'Expected a DeviceUtils object with serial %s' % serial) |
def testParallel_noDevices(self): |
- with self.assertCalls( |
- (mock.call.pylib.device.device_filter.DefaultFilters(), None), |
- (mock.call.pylib.device.adb_wrapper.AdbWrapper.Devices(filters=None), |
- [])): |
+ with self.assertCall( |
+ mock.call.pylib.device.adb_wrapper.AdbWrapper.GetDevices(), []): |
with self.assertRaises(device_errors.NoDevicesError): |
device_utils.DeviceUtils.parallel() |