mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 08:11:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate:launcher: Put all logs inside the failure node

Browse source 
Pleasing gitlab CI reporting system
This commit is contained in:
Thibault Saunier 2019-03-26 14:09:54 -03:00 committed by Thibault Saunier
parent 8da6ecef13
commit de007b6819
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
validate/launcher/reporters.py
View file

@ -137,23 +137,25 @@ class XunitReporter(Reporter):
self.report() self.report()
return super(XunitReporter, self).final_report() return super(XunitReporter, self).final_report()
def _get_captured(self, test): def _get_all_logs_data(self, test):
captured = ""
if not self.options.redirect_logs: if not self.options.redirect_logs:
value = test.get_log_content() return ""
if value:
captured += '<system-out><![CDATA[%s' % \
escape_cdata(value)
for extralog in test.extra_logfiles:
captured += "\n\n===== %s =====\n\n" % escape_cdata(
os.path.basename(extralog))
value = test.get_extra_log_content(extralog)
captured += escape_cdata(value)
captured += "]]></system-out>" captured = ""
value = test.get_log_content()
if value:
captured += escape_cdata(value)
for extralog in test.extra_logfiles:
captured += "\n\n===== %s =====\n\n" % escape_cdata(
os.path.basename(extralog))
value = test.get_extra_log_content(extralog)
captured += escape_cdata(value)
return captured return captured
def _get_captured(self, test):
return '<system-out><![CDATA[%s]]></system-out>' % self._get_all_logs_data(test)
def _quoteattr(self, attr): def _quoteattr(self, attr):
"""Escape an XML attribute. Value can be unicode.""" """Escape an XML attribute. Value can be unicode."""
attr = xml_safe(attr) attr = xml_safe(attr)
@ -172,8 +174,8 @@ class XunitReporter(Reporter):
self.encoding, 'replace') self.encoding, 'replace')
self.stats['encoding'] = self.encoding self.stats['encoding'] = self.encoding
self.stats['total'] = (self.stats['timeout'] + self.stats['failures'] + self.stats['total'] = (self.stats['timeout'] + self.stats['failures']
self.stats['passed'] + self.stats['skipped']) + self.stats['passed'] + self.stats['skipped'])
xml_file.write('<?xml version="1.0" encoding="%(encoding)s"?>' xml_file.write('<?xml version="1.0" encoding="%(encoding)s"?>'
'<testsuite name="gst-validate-launcher" tests="%(total)d" ' '<testsuite name="gst-validate-launcher" tests="%(total)d" '
@ -202,21 +204,17 @@ class XunitReporter(Reporter):
""" """
super().set_failed(test) super().set_failed(test)
stack_trace = ''
if test.stack_trace:
stack_trace = '<![CDATA[%s]]>' % (escape_cdata(test.stack_trace))
xml_file = codecs.open(self.tmp_xml_file.name, 'a', xml_file = codecs.open(self.tmp_xml_file.name, 'a',
self.encoding, 'replace') self.encoding, 'replace')
xml_file.write(self._forceUnicode( xml_file.write(self._forceUnicode(
'<testcase name=%(name)s time="%(taken).3f">' '<testcase name=%(name)s time="%(taken).3f">'
'<failure type=%(errtype)s message=%(message)s>%(stacktrace)s' '<failure type=%(errtype)s message=%(message)s>%(logs)s'
'</failure>%(systemout)s</testcase>' % '</failure></testcase>' %
{'name': self._quoteattr(test.get_classname() + '.' + test.get_name()), {'name': self._quoteattr(test.get_classname() + '.' + test.get_name()),
'taken': test.time_taken, 'taken': test.time_taken,
'stacktrace': stack_trace, 'logs': self._get_all_logs_data(test),
'errtype': self._quoteattr(test.result), 'errtype': self._quoteattr(test.result),
'message': self._quoteattr(test.message), 'message': self._quoteattr(test.message),
'systemout': self._get_captured(test),
})) }))
xml_file.close() xml_file.close()