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

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

Issue 1841863002: Update monet. (Closed) Base URL: https://github.com/domokit/monet.git@master
Patch Set: Created 4 years, 9 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
Index: build/android/pylib/instrumentation/test_runner.py
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py
index d1c5a4d6bc396e5a83523ca705b4cee57101154d..0f2e53fea733e032314bf5cee7ccd6d711e3df3b 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -100,6 +100,7 @@ class TestRunner(base_test_runner.BaseTestRunner):
# android_commands refactor?
self.device.RunShellCommand('stop')
self.device.RunShellCommand('start')
+ self.device.WaitUntilFullyBooted()
# We give different default value to launch HTTP server based on shard index
# because it may have race condition when multiple processes are trying to
@@ -342,6 +343,11 @@ class TestRunner(base_test_runner.BaseTestRunner):
try:
self.TestSetup(test)
+ try:
+ self.device.GoHome()
+ except device_errors.CommandTimeoutError:
+ logging.exception('Failed to focus the launcher.')
+
time_ms = lambda: int(time.time() * 1000)
start_ms = time_ms()
raw_output = self._RunTest(test, timeout)
« no previous file with comments | « build/android/pylib/instrumentation/test_options.py ('k') | build/android/pylib/local/device/local_device_environment.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698