diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/pylib/gtest/test_runner.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py index 0fc6c12..b561058 100644 --- a/build/android/pylib/gtest/test_runner.py +++ b/build/android/pylib/gtest/test_runner.py @@ -26,6 +26,10 @@ RE_RUNNER_FAIL = re.compile('\\[ RUNNER_FAILED \\] ?(.*)\r\n') # to output the CRASHED marker when a crash happens. RE_CRASH = re.compile('\\[ CRASHED \\](.*)\r\n') +# Bots that don't output anything for 20 minutes get timed out, so that's our +# hard cap. +_INFRA_STDOUT_TIMEOUT = 20 * 60 + def _TestSuiteRequiresMockTestServer(suite_name): """Returns True if the test suite requires mock test server.""" @@ -62,7 +66,8 @@ class TestRunner(base_test_runner.BaseTestRunner): if os.environ.get('BUILDBOT_SLAVENAME'): timeout = timeout * 2 - self._timeout = timeout * self.tool.GetTimeoutScale() + self._timeout = min(timeout * self.tool.GetTimeoutScale(), + _INFRA_STDOUT_TIMEOUT) if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name): self._perf_controller = perf_control.PerfControl(self.device) |