wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1113768 - Stop buffering a test's output after a failure is seen.;r=froydnj

Browse Source
This commit is contained in:
Chris Manchester 2014-12-26 13:28:50 -05:00
parent 7ce751f019
commit 00274dd52f
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
testing/mochitest/runtests.py
View File

@ -116,6 +116,7 @@ class MessageLogger(object):
def __init__(self, logger, buffering=True): def __init__(self, logger, buffering=True):
self.logger = logger self.logger = logger
self.buffering = buffering self.buffering = buffering
self.restore_buffering = False
self.tests_started = False self.tests_started = False
# Message buffering # Message buffering
@ -175,43 +176,44 @@ class MessageLogger(object):
unstructured = True unstructured = True
message.pop('unstructured') message.pop('unstructured')
# Saving errors/failures to be shown at the end of the test run # Error detection also supports "raw" errors (in log messages) because some tests
is_error = 'expected' in message or (message['action'] == 'log' and message['message'].startswith('TEST-UNEXPECTED')) # manually dump 'TEST-UNEXPECTED-FAIL'.
if is_error: if ('expected' in message or
(message['action'] == 'log' and message['message'].startswith('TEST-UNEXPECTED'))):
# Saving errors/failures to be shown at the end of the test run
self.errors.append(message) self.errors.append(message)
self.restore_buffering = self.restore_buffering or self.buffering
# If we don't do any buffering, or the tests haven't started, or the message was unstructured, it is directly logged self.buffering = False
if not self.buffering or unstructured or not self.tests_started:
self.logger.log_raw(message)
return
# If a test ended, we clean the buffer
if message['action'] == 'test_end':
self.buffered_messages = []
# Buffering logic; Also supports "raw" errors (in log messages) because some tests manually dump 'TEST-UNEXPECTED-FAIL'
if not is_error and message['action'] not in self.BUFFERED_ACTIONS:
self.logger.log_raw(message)
return
# test_status messages buffering
if is_error:
if self.buffered_messages: if self.buffered_messages:
snipped = len(self.buffered_messages) - self.BUFFERING_THRESHOLD snipped = len(self.buffered_messages) - self.BUFFERING_THRESHOLD
if snipped > 0: if snipped > 0:
self.logger.info("<snipped {0} output lines - " self.logger.info("<snipped {0} output lines - "
"if you need more context, please use " "if you need more context, please use "
"SimpleTest.requestCompleteLog() in your test>" "SimpleTest.requestCompleteLog() in your test>"
.format(snipped)) .format(snipped))
# Dumping previously buffered messages # Dumping previously buffered messages
self.dump_buffered(limit=True) self.dump_buffered(limit=True)
# Logging the error message # Logging the error message
self.logger.log_raw(message) self.logger.log_raw(message)
# If we don't do any buffering, or the tests haven't started, or the message was
# unstructured, it is directly logged.
elif any([not self.buffering,
unstructured,
not self.tests_started,
message['action'] not in self.BUFFERED_ACTIONS]):
self.logger.log_raw(message)
else: else:
# Buffering the message # Buffering the message
self.buffered_messages.append(message) self.buffered_messages.append(message)
# If a test ended, we clean the buffer
if message['action'] == 'test_end':
self.buffered_messages = []
if self.restore_buffering:
self.restore_buffering = False
self.buffering = True
def write(self, line): def write(self, line):
messages = self.parse_line(line) messages = self.parse_line(line)
for message in messages: for message in messages: