Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(381)

Unified Diff: sky/tools/webkitpy/layout_tests/port/driver.py

Issue 686723004: Make printing limbo lines in test_sky only print the prefix once. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/tools/webkitpy/layout_tests/port/driver.py
diff --git a/sky/tools/webkitpy/layout_tests/port/driver.py b/sky/tools/webkitpy/layout_tests/port/driver.py
index 7d764951bfb492d99c89ddb29479945e52bcc5ed..1a72833dd28bc3a22266cd729ea9ff59f2e3bb0e 100644
--- a/sky/tools/webkitpy/layout_tests/port/driver.py
+++ b/sky/tools/webkitpy/layout_tests/port/driver.py
@@ -451,6 +451,8 @@ class Driver(object):
out_seen_eof = False
have_seen_begin = not is_first_block
+ have_printed_stdout_limbo_line = False
+ have_printed_stderr_limbo_line = False
while not self.has_crashed():
if out_seen_eof and (self.err_seen_eof or not wait_for_stderr_eof):
@@ -468,16 +470,20 @@ class Driver(object):
if not have_seen_begin:
# FIXME(sky): Instead of logging, this should cause the previous test to fail.
if err_line:
- _log.error('Saw a stderr line between the end of the previous test and the start of the current one: %s' % (
- err_line))
+ if not have_printed_stdout_limbo_line:
+ have_printed_stdout_limbo_line = True
+ _log.error('\nSaw a stderr lines between the end of the previous test and the start of the current one:')
+ _log.error(err_line)
if out_line:
if out_line == '#BEGIN\n':
have_seen_begin = True
out_line = ''
block.content = ''
else:
- _log.error('Saw a stdout line between the end of the previous test and the start of the current one: %s' % (
- out_line))
+ if not have_printed_stdout_limbo_line:
+ have_printed_stdout_limbo_line = True
+ _log.error('\nSaw a stdout line between the end of the previous test and the start of the current one:')
+ _log.error(out_line)
if self._server_process.timed_out or self.has_crashed():
break
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698