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

Unified Diff: build/android/pylib/uiautomator/test_runner.py

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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/perf/surface_stats_collector.py ('k') | build/android/pylib/utils/host_path_finder.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/uiautomator/test_runner.py
diff --git a/build/android/pylib/uiautomator/test_runner.py b/build/android/pylib/uiautomator/test_runner.py
index b47a23689978e320a860d9eff841915ec7d34e40..1ab9545f73dce47ecf52317217ea9ecd2389a7c0 100644
--- a/build/android/pylib/uiautomator/test_runner.py
+++ b/build/android/pylib/uiautomator/test_runner.py
@@ -40,7 +40,8 @@ class TestRunner(instr_test_runner.TestRunner):
test_apk_jar_path=None,
test_runner=None,
test_support_apk_path=None,
- device_flags=None)
+ device_flags=None,
+ isolate_file_path=None)
super(TestRunner, self).__init__(instrumentation_options, device,
shard_index, test_pkg)
@@ -56,15 +57,11 @@ class TestRunner(instr_test_runner.TestRunner):
self.test_pkg.Install(self.device)
#override
- def PushDataDeps(self):
- pass
-
- #override
def _RunTest(self, test, timeout):
self.device.ClearApplicationState(self._package)
if self.flags:
annotations = self.test_pkg.GetTestAnnotations(test)
- if ('FirstRunExperience' == annotations.get('Feature', None)):
+ if 'FirstRunExperience' == annotations.get('Feature', None):
self.flags.RemoveFlags(['--disable-fre'])
else:
self.flags.AddFlags(['--disable-fre'])
« no previous file with comments | « build/android/pylib/perf/surface_stats_collector.py ('k') | build/android/pylib/utils/host_path_finder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698