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

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

Issue 1161023003: Wait until rebooting is done if java assert is not set. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..174f4efb5e2e12c61fa8f3823622c4aa33df420a 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -11,6 +11,7 @@ import sys
import time
from pylib import constants
+from pylib import device_settings
from pylib import flag_changer
from pylib import valgrind_tools
from pylib.base import base_test_result
@@ -98,8 +99,10 @@ class TestRunner(base_test_runner.BaseTestRunner):
if self.device.SetJavaAsserts(self.options.set_asserts):
# TODO(jbudorick) How to best do shell restart after the
# android_commands refactor?
+ device_settings.SetLockScreenSettings(self.device)
jbudorick 2015/05/29 13:06:15 Why would we set the lock screen settings here?
JungJik 2015/06/01 14:44:51 When I execute the instrumentation, if the lock sc
jbudorick 2015/06/01 14:50:56 This isn't in the scope of the test runner. We han
JungJik 2015/06/02 16:09:45 thanks for your help. I've checked the file. I've
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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698