Merge pull request grpc#1078 from dklempner/run_tests_timeout

Unconditionally add a newline if a test times out or fails.
joshua · Mar 18, 2015 · 6fba6e1 · 6fba6e1
2 parents 1e82c63 + 559543e
commit 6fba6e1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py
@@ -192,15 +192,15 @@ def state(self, update_cache):
         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),
                 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:
-      message('TIMEOUT', self._spec.shortname, do_newline=self._travis)
+      message('TIMEOUT', self._spec.shortname, do_newline=True)
       self.kill()
     return self._state