diff options
| author | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 02:05:37 +0000 |
|---|---|---|
| committer | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 02:05:37 +0000 |
| commit | e2d81b055fbfcdaff73c52da161ce330ea25b0ab (patch) | |
| tree | 87f41daff1bcf778a4a845f3071c25a1ca46456c | |
| parent | 4d999c0e16a37d67571968749bcb2d042bcfe4e7 (diff) | |
| download | chromium_src-e2d81b055fbfcdaff73c52da161ce330ea25b0ab.zip chromium_src-e2d81b055fbfcdaff73c52da161ce330ea25b0ab.tar.gz chromium_src-e2d81b055fbfcdaff73c52da161ce330ea25b0ab.tar.bz2 | |
[Android] Attempt to fix timeouts on Android bots.
Use subprocess communicate for getting md5sum hashes on the host.
BUG=224382
TBR=craigdh@chromium.org
Review URL: https://codereview.chromium.org/13693002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192444 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/android/pylib/android_commands.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py index 46bc3e4..793667f 100644 --- a/build/android/pylib/android_commands.py +++ b/build/android/pylib/android_commands.py @@ -682,10 +682,9 @@ class AndroidCommands(object): self.RunShellCommand(self._util_wrapper + ' ' + MD5SUM_DEVICE_PATH + ' ' + device_path)) assert os.path.exists(local_path), 'Local path not found %s' % local_path - hashes_on_host = _ComputeFileListHash( - subprocess.Popen( - '%s_host %s' % (self._md5sum_path, local_path), - stdout=subprocess.PIPE, shell=True).stdout) + md5sum_output = cmd_helper.GetCmdOutput( + ['%s_host' % self._md5sum_path, local_path]) + hashes_on_host = _ComputeFileListHash(md5sum_output) if hashes_on_device == hashes_on_host: return |