diff options
| author |  Vijay Pai <vpai@google.com> | 2015-03-17 21:20:17 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2015-03-17 21:20:17 -0700 |
| commit | 6fba6e1f6b0a2c81030836bfb6821cf1057c8f60 (patch) | |
| tree | c6105ef787fa366303609fd9e047409083436e0a /tools | |
| parent | 1e82c63a77a61f01c3f7ecd83f895c051995c43b (diff) | |
| parent | 559543ec0d08fc5447224f34a4bcfc718708bb43 (diff) | |
Merge pull request #1078 from dklempner/run_tests_timeout
Unconditionally add a newline if a test times out or fails.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/jobset.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index 26caf031c3..81cdd0e6e4 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -192,7 +192,7 @@ class Job(object): self._tempfile.seek(0) stdout = self._tempfile.read() message('FAILED', '%s [ret=%d]' % ( - self._spec.shortname, self._process.returncode), stdout) + self._spec.shortname, self._process.returncode), stdout, do_newline=True) else: self._state = _SUCCESS message('PASSED', '%s [time=%.1fsec]' % (self._spec.shortname, elapsed), @@ -200,7 +200,7 @@ class Job(object): if self._bin_hash: update_cache.finished(self._spec.identity(), self._bin_hash) elif self._state == _RUNNING and time.time() - self._start > 300: - message('TIMEOUT', self._spec.shortname, do_newline=self._travis) + message('TIMEOUT', self._spec.shortname, do_newline=True) self.kill() return self._state |