1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: output tap13 instead of almost-tap

Browse Source 
Produce a tap13-compatible output which makes it
simpler to parse. Output is still readable by
the jenkins tap plugin.

PR-URL: https://github.com/nodejs/node/pull/9262
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
This commit is contained in:
Johan Bergström 2016-10-12 11:34:28 -03:00
parent ca57912e05
commit b634ef70da
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tools/test.py
View File

@ -256,11 +256,15 @@ class DotsProgressIndicator(SimpleProgressIndicator):
class TapProgressIndicator(SimpleProgressIndicator):
def _printDiagnostic(self, messages):
for l in messages.splitlines():
logger.info('# ' + l)
def _printDiagnostic(self, traceback, severity):
logger.info(' severity: %s', severity)
logger.info(' stack: |-')
for l in traceback.splitlines():
logger.info(' ' + l)
def Starting(self):
logger.info('TAP version 13')
logger.info('1..%i' % len(self.cases))
self._done = 0
@ -269,6 +273,8 @@ class TapProgressIndicator(SimpleProgressIndicator):
def HasRun(self, output):
self._done += 1
self.traceback = ''
self.severity = 'ok'
# Print test name as (for example) "parallel/test-assert". Tests that are
# scraped from the addons documentation are all named test.js, making it
@ -281,19 +287,23 @@ class TapProgressIndicator(SimpleProgressIndicator):
if output.UnexpectedOutput():
status_line = 'not ok %i %s' % (self._done, command)
self.severity = 'fail'
self.traceback = output.output.stdout + output.output.stderr
if FLAKY in output.test.outcomes and self.flaky_tests_mode == DONTCARE:
status_line = status_line + ' # TODO : Fix flaky test'
self.severity = 'flaky'
logger.info(status_line)
self._printDiagnostic("\n".join(output.diagnostic))
if output.HasCrashed():
self._printDiagnostic(PrintCrashed(output.output.exit_code))
self.severity = 'crashed'
exit_code = output.output.exit_code
self.traceback = "oh no!\nexit code: " + PrintCrashed(exit_code)
if output.HasTimedOut():
self._printDiagnostic('TIMEOUT')
self.severity = 'fail'
self._printDiagnostic(output.output.stderr)
self._printDiagnostic(output.output.stdout)
else:
skip = skip_regex.search(output.output.stdout)
if skip:
@ -304,7 +314,11 @@ class TapProgressIndicator(SimpleProgressIndicator):
if FLAKY in output.test.outcomes:
status_line = status_line + ' # TODO : Fix flaky test'
logger.info(status_line)
self._printDiagnostic("\n".join(output.diagnostic))
if output.diagnostic:
self.severity = 'ok'
self.traceback = output.diagnostic
duration = output.test.duration
@ -315,7 +329,12 @@ class TapProgressIndicator(SimpleProgressIndicator):
# duration_ms is measured in seconds and is read as such by TAP parsers.
# It should read as "duration including ms" rather than "duration in ms"
logger.info(' ---')
logger.info(' duration_ms: %d.%d' % (total_seconds, duration.microseconds / 1000))
logger.info(' duration_ms: %d.%d' %
(total_seconds, duration.microseconds / 1000))
if self.severity is not 'ok' or self.traceback is not '':
if output.HasTimedOut():
self.traceback = 'timeout'
self._printDiagnostic(self.traceback, self.severity)
logger.info(' ...')
def Done(self):