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

Unified Diff: build/android/pylib/android_commands.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 | « no previous file | third_party/android_testrunner/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/android_commands.py
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index 3d13f196a6f9a45aaede3df6e4bba747c9d1afd1..d709934455f203a29328b890aaa2e16612d7cba9 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -394,7 +394,7 @@ class AndroidCommands(object):
'Unable to find $EXTERNAL_STORAGE')
return self._external_storage
- def WaitForDevicePm(self):
+ def WaitForDevicePm(self, timeout=120):
"""Blocks until the device's package manager is available.
To workaround http://b/5201039, we restart the shell and retry if the
@@ -407,7 +407,7 @@ class AndroidCommands(object):
retries = 3
while retries:
try:
- self._adb.WaitForDevicePm()
+ self._adb.WaitForDevicePm(wait_time=timeout)
return # Success
except errors.WaitForResponseTimedOutError as e:
last_err = e
@@ -446,7 +446,7 @@ class AndroidCommands(object):
timeout = 120
# To run tests we need at least the package manager and the sd card (or
# other external storage) to be ready.
- self.WaitForDevicePm()
+ self.WaitForDevicePm(timeout)
self.WaitForSdCardReady(timeout)
def Shutdown(self):
« no previous file with comments | « no previous file | third_party/android_testrunner/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698