aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-07-10 13:33:47 -0700
committerGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-07-10 13:33:47 -0700
commit8a154f9330de33134fd4ef1fc6bea211fb60f547 (patch)
treee49cecc496bbb5e1da545d5c6f74168b5bad0b52
parenta92979ed05db34aafaeccd25ed159fa40c858abb (diff)
parentd4a43b20eeaa94db127fd8a792fdc0fb6695795c (diff)
Merge pull request #2372 from ctiller/timeouts-make-me-sad
Increase timeouts for tests
-rwxr-xr-xtools/run_tests/jobset.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py
index e5138147d3..b9af169739 100755
--- a/tools/run_tests/jobset.py
+++ b/tools/run_tests/jobset.py
@@ -206,7 +206,7 @@ class Job(object):
do_newline=self._newline_on_success or self._travis)
if self._bin_hash:
update_cache.finished(self._spec.identity(), self._bin_hash)
- elif self._state == _RUNNING and time.time() - self._start > 300:
+ elif self._state == _RUNNING and time.time() - self._start > 600:
self._tempfile.seek(0)
stdout = self._tempfile.read()
message('TIMEOUT', self._spec.shortname, stdout, do_newline=True)