From e552c18c8010328aeaa8f1b182b7eace7289d8a5 Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@gnome.org>
Date: Thu, 1 Dec 2016 10:51:56 -0300
Subject: [PATCH] launcher: Handle stack trace information as jenkins expect it
 in the xunit file

---
 validate/launcher/reporters.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/validate/launcher/reporters.py b/validate/launcher/reporters.py
index 5006ab1aeb..9a5dc13471 100644
--- a/validate/launcher/reporters.py
+++ b/validate/launcher/reporters.py
@@ -204,15 +204,13 @@ class XunitReporter(Reporter):
 
         stack_trace = ''
         if test.stack_trace:
-            stack_trace = '<message><![CDATA[%s]]></message>\n' \
-                '<stack-trace><![CDATA[%s]]></stack-trace>' % (
-                    self._quoteattr(test.message), escape_cdata(test.stack_trace))
+            stack_trace = '<![CDATA[%s]]>' % (escape_cdata(test.stack_trace))
         xml_file = codecs.open(self.tmp_xml_file.name, 'a',
                                self.encoding, 'replace')
         xml_file.write(self._forceUnicode(
             '<testcase classname=%(cls)s name=%(name)s time="%(taken).3f">'
-            '<failure type=%(errtype)s message=%(message)s>%(stacktrace)s'
-            '</failure>%(systemout)s</testcase>' %
+            '<error type=%(errtype)s message=%(message)s>%(stacktrace)s'
+            '</error>%(systemout)s</testcase>' %
             {'cls': self._quoteattr(test.get_classname()),
              'name': self._quoteattr(test.get_name()),
              'taken': test.time_taken,