mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-28 17:25:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
validate/gst/validate/gst-validate-scenario.c
View file

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

7
validate/tools/launcher/baseclasses.py
View file

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

15
validate/tools/launcher/reporters.py
View file

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