build/android/pylib/device/device_utils_test.py - Issue 1083403002: [Android] Remove android_commands uses from build/android/. (reland)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1083403002: [Android] Remove android_commands uses from build/android/. (reland) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixed 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

« build/android/pylib/device/adb_wrapper.py ('K') | « build/android/pylib/device/device_utils.py ('k') | build/android/pylib/local/device/local_device_environment.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 414d856b27aca294ba3ca6d60a6e42685f6efd3d..3806e266a4f2ea564a13bd9cd777ed538c8add91 100755

--- a/build/android/pylib/device/device_utils_test.py

+++ b/build/android/pylib/device/device_utils_test.py

@@ -1551,9 +1551,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(

@@ -1562,8 +1563,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()