diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 04:25:40 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 04:25:40 +0000 |
| commit | dd12ca97c175d62a5fbb1cb49ffe98d7268c6c21 (patch) | |
| tree | 872959ba32661adaacef999f0ab9e7a5c570690c /build/android/pylib | |
| parent | 70521c9a0ccc0bf64daf799e84e4dee7ee5f06c9 (diff) | |
| download | chromium_src-dd12ca97c175d62a5fbb1cb49ffe98d7268c6c21.zip chromium_src-dd12ca97c175d62a5fbb1cb49ffe98d7268c6c21.tar.gz chromium_src-dd12ca97c175d62a5fbb1cb49ffe98d7268c6c21.tar.bz2 | |
Allow provision_devices to work on the L-release preview.
We weren't respecting the full timeout specified by the Reboot() method. And
apparently timing is different enough on the L-release preview that reboots
get stuck forever without the timeout.
BUG=389362
Review URL: https://codereview.chromium.org/375973002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/pylib')
| -rw-r--r-- | build/android/pylib/android_commands.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py index c77ea65..7470081 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): |