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

Unified Diff: third_party/android_testrunner/adb_interface.py

Issue 375973002: Allow provision_devices to work on the L-release preview. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: jbudorick comments Created 6 years, 5 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 | « third_party/android_testrunner/README.chromium ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/android_testrunner/adb_interface.py
diff --git a/third_party/android_testrunner/adb_interface.py b/third_party/android_testrunner/adb_interface.py
index b8f740b2f01b2e31e13cb84c1ed6c95af02b41a3..93e19632a84b08da4269e2f8b965d4c392b42c4d 100644
--- a/third_party/android_testrunner/adb_interface.py
+++ b/third_party/android_testrunner/adb_interface.py
@@ -318,7 +318,7 @@ class AdbInterface:
respond.
"""
logger.Log("Waiting for device package manager...")
- self.SendCommand("wait-for-device")
+ self.SendCommand("wait-for-device", timeout_time=wait_time, retry_count=0)
# Now the device is there, but may not be running.
# Query the package manager with a basic command
try:
@@ -409,7 +409,8 @@ class AdbInterface:
while not success and (attempts*wait_period) < wait_time:
# assume the command will always contain expected in the success case
try:
- output = self.SendShellCommand(command, retry_count=1)
+ output = self.SendShellCommand(command, retry_count=1,
+ timeout_time=wait_time)
if ((not invert and expected in output)
or (invert and expected not in output)):
success = True
« no previous file with comments | « third_party/android_testrunner/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698