Revert "validate:launcher: Always put gst-validate result as stderr in reports"

This reverts commit 925ff7542b.

Actually jenkins never  truncates on failure stacktrace... we do not
want to set gst-validate as failure stacktrace in our results. That
commit was not usefull.
This commit is contained in:
Thibault Saunier 2014-04-26 09:16:26 +02:00
parent 925ff7542b
commit a3a132489a
3 changed files with 9 additions and 16 deletions

View file

@ -1504,8 +1504,7 @@ init_scenarios (void)
"Action to wait during 'duration' seconds", FALSE);
gst_validate_add_action_type ("dot-pipeline", _execute_dot_pipeline, NULL,
"Action to wait dot the pipeline (the 'name' property will be included in the"
" dot filename. Also the GST_DEBUG_DUMP_DOT_DIR env variable needs to be set",
FALSE);
" dot filename. Also the GST_DEBUG_DUMP_DOT_DIR env variable needs to be set", FALSE);
gst_validate_add_action_type ("set-feature-rank", _set_rank, NULL,
"Allows you to change the ranking of a particular plugin feature", TRUE);
}

View file

@ -90,7 +90,7 @@ class Test(Loggable):
value = f.read()
f.close()
return value, sys.stdout
return value
def get_classname(self):
@ -287,13 +287,12 @@ class GstValidateTest(Test):
self.add_arguments("--set-scenario", self.scenario.name)
def get_extra_log_content(self, extralog):
value, stdo = Test.get_extra_log_content(self, extralog)
value = Test.get_extra_log_content(self, extralog)
if extralog == self.validatelogs:
value = re.sub("<position:.*/>\r", "", value)
stdo = sys.stderr
return value, stdo
return value
def get_validate_criticals_errors(self):
ret = "["

View file

@ -21,7 +21,6 @@
import os
import re
import sys
import codecs
from loggable import Loggable
from xml.sax import saxutils
@ -140,17 +139,13 @@ class XunitReporter(Reporter):
if value:
captured += '<system-out><![CDATA[%s' % \
escape_cdata(value)
captured += "]]></system-out>\n"
for extralog in self._current_test.extra_logfiles:
value, stdo = self._current_test.get_extra_log_content(extralog)
if stdo == sys.stdout:
out = 'system-out'
else:
out = 'system-err'
captured += '<%s><![CDATA[%s%s]]></%s>\n' % (out,
"\n\n===== %s =====\n\n" % escape_cdata(os.path.basename(extralog)),
escape_cdata(value), out)
captured += "\n\n===== %s =====\n\n" % escape_cdata(os.path.basename(extralog))
value = self._current_test.get_extra_log_content(extralog)
captured += escape_cdata(value)
captured += "]]></system-out>"
return captured