build/android/pylib/local/device/local_device_instrumentation_test_run.py - Issue 2492123002: [android] Stop using isolate.py for data dependency management.

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/local/device/local_device_instrumentation_test_run.py

Issue 2492123002: [android] Stop using isolate.py for data dependency management. (Closed)

Patch Set: handle None isolate file Created 4 years, 1 month 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

« no previous file with comments | « build/android/pylib/local/device/local_device_gtest_run.py ('k') | build/android/pylib/local/device/local_device_test_run.py » ('j') | build/android/pylib/utils/device_dependencies.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/local/device/local_device_instrumentation_test_run.py

diff --git a/build/android/pylib/local/device/local_device_instrumentation_test_run.py b/build/android/pylib/local/device/local_device_instrumentation_test_run.py

index 59d43a90644c95c21b3f06f43c26598837704d5a..cb821dbccfa11b66f1d9eb80b5003da6652ba3cf 100644

--- a/build/android/pylib/local/device/local_device_instrumentation_test_run.py

+++ b/build/android/pylib/local/device/local_device_instrumentation_test_run.py

@@ -64,14 +64,6 @@ class LocalDeviceInstrumentationTestRun(

#override

def SetUp(self):

- def substitute_device_root(d, device_root):

- if not d:

- return device_root

- elif isinstance(d, list):

- return posixpath.join(*(p if p else device_root for p in d))

- else:

- return d

@local_device_environment.handle_shard_failures_with(

self._env.BlacklistDevice)

def individual_device_set_up(dev, host_device_tuples):

@@ -115,7 +107,7 @@ class LocalDeviceInstrumentationTestRun(

device_root = posixpath.join(dev.GetExternalStoragePath(),

'chromium_tests_root')

host_device_tuples_substituted = [

- (h, substitute_device_root(d, device_root))

+ (h, local_device_test_run.SubstituteDeviceRoot(d, device_root))

for h, d in host_device_tuples]

logging.info('instrumentation data deps:')

for h, d in host_device_tuples_substituted: