build/android/devil/android/device_utils_test.py - Issue 1397663002: DeviceUtils.StartInstrumentation: Shrink command-line

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/devil/android/device_utils_test.py

Issue 1397663002: DeviceUtils.StartInstrumentation: Shrink command-line (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: make helper func Created 5 years, 2 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/devil/android/device_utils.py ('K') | « build/android/devil/android/device_utils.py ('k') | build/android/devil/utils/cmd_helper.py » ('j') | build/android/devil/utils/cmd_helper.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/devil/android/device_utils_test.py

diff --git a/build/android/devil/android/device_utils_test.py b/build/android/devil/android/device_utils_test.py

index 4cb4591843ea85c3302d756871f1ce45bdc2ebff..a3c2cccf195894d930fd3ab5b3a71d3018426388 100755

--- a/build/android/devil/android/device_utils_test.py

+++ b/build/android/devil/android/device_utils_test.py

@@ -1180,7 +1180,7 @@ class DeviceUtilsStartInstrumentationTest(DeviceUtilsTest):

def testStartInstrumentation_nothing(self):

with self.assertCalls(

self.call.device.RunShellCommand(

- ['am', 'instrument', 'test.package/.TestInstrumentation'],

+ 'p=test.package;am instrument "$p"/.TestInstrumentation',

check_return=True, large_output=True)):

self.device.StartInstrumentation(

'test.package/.TestInstrumentation',

@@ -1189,7 +1189,7 @@ class DeviceUtilsStartInstrumentationTest(DeviceUtilsTest):

def testStartInstrumentation_finish(self):

with self.assertCalls(

(self.call.device.RunShellCommand(

- ['am', 'instrument', '-w', 'test.package/.TestInstrumentation'],

+ 'p=test.package;am instrument -w "$p"/.TestInstrumentation',

check_return=True, large_output=True),

['OK (1 test)'])):

output = self.device.StartInstrumentation(

@@ -1200,7 +1200,7 @@ class DeviceUtilsStartInstrumentationTest(DeviceUtilsTest):

def testStartInstrumentation_raw(self):

with self.assertCalls(

self.call.device.RunShellCommand(

- ['am', 'instrument', '-r', 'test.package/.TestInstrumentation'],

+ 'p=test.package;am instrument -r "$p"/.TestInstrumentation',

check_return=True, large_output=True)):

self.device.StartInstrumentation(

'test.package/.TestInstrumentation',

@@ -1209,12 +1209,13 @@ class DeviceUtilsStartInstrumentationTest(DeviceUtilsTest):

def testStartInstrumentation_extras(self):

with self.assertCalls(

self.call.device.RunShellCommand(

- ['am', 'instrument', '-e', 'foo', 'Foo', '-e', 'bar', 'Bar',

- 'test.package/.TestInstrumentation'],

+ 'p=test.package;am instrument -e "$p".foo Foo -e bar \'Val \'"$p" '

+ '"$p"/.TestInstrumentation',

check_return=True, large_output=True)):

self.device.StartInstrumentation(

'test.package/.TestInstrumentation',

- finish=False, raw=False, extras={'foo': 'Foo', 'bar': 'Bar'})

+ finish=False, raw=False, extras={'test.package.foo': 'Foo',

+ 'bar': 'Val test.package'})

class DeviceUtilsBroadcastIntentTest(DeviceUtilsTest):