test: output tap13 instead of almost-tap

Produce a tap13-compatible output which makes it simpler to parse. Output is still readable by the jenkins tap plugin. PR-URL: #9262 Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Myles Borins <[email protected]>

Author: jbergstroem

tools/test.py

@@ -256,11 +256,15 @@ def HasRun(self, output):
 
 classTapProgressIndicator(SimpleProgressIndicator):
 
-def_printDiagnostic(self, messages):
-forlinmessages.splitlines():
-logger.info('# '+l)
+def_printDiagnostic(self, traceback, severity):
+logger.info(' severity: %s', severity)
+logger.info(' stack: |-')
+
+forlintraceback.splitlines():
+logger.info(' '+l)
 
 defStarting(self):
+logger.info('TAP version 13')
 logger.info('1..%i'%len(self.cases))
 self._done=0
 
@@ -269,6 +273,8 @@ def AboutToRun(self, case):
 
 defHasRun(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 @@ def HasRun(self, output):
 
 ifoutput.UnexpectedOutput():
 status_line='not ok %i %s'% (self._done, command)
+self.severity='fail'
+self.traceback=output.output.stdout+output.output.stderr
+
 ifFLAKYinoutput.test.outcomesandself.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))
 
 ifoutput.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)
 
 ifoutput.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)
 ifskip:
@@ -304,7 +314,11 @@ def HasRun(self, output):
 ifFLAKYinoutput.test.outcomes:
 status_line=status_line+' # TODO : Fix flaky test'
 logger.info(status_line)
-self._printDiagnostic("\n".join(output.diagnostic))
+
+ifoutput.diagnostic:
+self.severity='ok'
+self.traceback=output.diagnostic
+
 
 duration=output.test.duration
 
@@ -313,7 +327,12 @@ def HasRun(self, output):
  (duration.seconds+duration.days*24*3600) *10**6) /10**6
 
 logger.info(' ---')
-logger.info(' duration_ms: %d.%d'% (total_seconds, duration.microseconds/1000))
+logger.info(' duration_ms: %d.%d'%
+ (total_seconds, duration.microseconds/1000))
+ifself.severityisnot'ok'orself.tracebackisnot'':
+ifoutput.HasTimedOut():
+self.traceback='timeout'
+self._printDiagnostic(self.traceback, self.severity)
 logger.info(' ...')
 
 defDone(self):