From 559543ec0d08fc5447224f34a4bcfc718708bb43 Mon Sep 17 00:00:00 2001
From: David Klempner <klempner@google.com>
Date: Tue, 17 Mar 2015 20:27:48 -0700
Subject: [PATCH] Unconditionally add a newline if a test times out or fails.
Failure should generally result in output unless something goes wrong,
but timeout currently doesn't, but should be printed 100% of the time.
---
tools/run_tests/jobset.py | 4 ++--
1 file 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
--
GitLab