Commit 6dcc239b authored by John Budorick's avatar John Budorick Committed by Commit Bot

android: raise gtest data dependency push timeout.

Bug: 791632
Change-Id: I2feff44cf4f875e064bc701fc7f74bf84811e3c8
Reviewed-on: https://chromium-review.googlesource.com/c/1304058Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603517}
parent f0c82a42
...@@ -317,7 +317,11 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun): ...@@ -317,7 +317,11 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun):
for h, d in host_device_tuples] for h, d in host_device_tuples]
dev.PushChangedFiles( dev.PushChangedFiles(
host_device_tuples_substituted, host_device_tuples_substituted,
delete_device_stale=True) delete_device_stale=True,
# Some gtest suites, e.g. unit_tests, have data dependencies that
# can take longer than the default timeout to push. See
# crbug.com/791632 for context.
timeout=600)
if not host_device_tuples: if not host_device_tuples:
dev.RemovePath(device_root, force=True, recursive=True, rename=True) dev.RemovePath(device_root, force=True, recursive=True, rename=True)
dev.RunShellCommand(['mkdir', '-p', device_root], check_return=True) dev.RunShellCommand(['mkdir', '-p', device_root], check_return=True)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment