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

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
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:

Powered by Google App Engine
This is Rietveld 408576698