test: add TAP diagnostic message for retried tests

Tests on SmartOS are sometimes retried due to a SmartOS issue on CI.
When this happens, a TAP diagnostic message is written.
PR-URL: #3960
Reviewed-By: Fedor Indutny <fedor@indutny.com>

Author: Trott

tools/test.py

@@ -145,6 +145,7 @@ def RunSingle(self, parallel, thread_id):
 sys.platform=='sunos5'and
 'ECONNREFUSED'inoutput.output.stderr):
 output=case.Run()
+output.diagnostic.append('ECONNREFUSED received, test retried')
 case.duration= (datetime.now() -start)
 exceptIOError, e:
 return
@@ -255,6 +256,10 @@ def HasRun(self, output):
 
 classTapProgressIndicator(SimpleProgressIndicator):
 
+def_printDiagnostic(self, messages):
+forlinmessages.splitlines():
+logger.info('# '+l)
+
 defStarting(self):
 logger.info('1..%i'%len(self.cases))
 self._done=0
@@ -270,14 +275,13 @@ def HasRun(self, output):
 ifFLAKYinoutput.test.outcomesandself.flaky_tests_mode==DONTCARE:
 status_line=status_line+' # TODO : Fix flaky test'
 logger.info(status_line)
+self._printDiagnostic("\n".join(output.diagnostic))
 
 ifoutput.HasTimedOut():
-logger.info('# TIMEOUT')
+self._printDiagnostic('TIMEOUT')
 
-forlinoutput.output.stderr.splitlines():
-logger.info('#'+l)
-forlinoutput.output.stdout.splitlines():
-logger.info('#'+l)
+self._printDiagnostic(output.output.stderr)
+self._printDiagnostic(output.output.stdout)
 else:
 skip=skip_regex.search(output.output.stdout)
 ifskip:
@@ -288,6 +292,7 @@ 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))
 
 duration=output.test.duration
 
@@ -490,6 +495,7 @@ def __init__(self, test, command, output, store_unexpected_output):
 self.command=command
 self.output=output
 self.store_unexpected_output=store_unexpected_output
+self.diagnostic= []
 
 defUnexpectedOutput(self):
 ifself.HasCrashed():