validate:launcher: Use a xunit reporter only when explicitely specified

This commit is contained in:
Thibault Saunier 2016-09-06 16:21:05 -03:00
parent 4090b0a7ae
commit 23203ca0bd
3 changed files with 6 additions and 6 deletions

View file

@ -1226,7 +1226,10 @@ class _TestsLauncher(Loggable):
globals()["__file__"] = c__file__ globals()["__file__"] = c__file__
def set_settings(self, options, args): def set_settings(self, options, args):
self.reporter = reporters.XunitReporter(options) if options.xunit_file:
self.reporter = reporters.XunitReporter(options)
else:
self.reporter = reporters.Reporter(options)
self.options = options self.options = options
wanted_testers = None wanted_testers = None

View file

@ -251,8 +251,6 @@ class LauncherConfig(Loggable):
self.logsdir = None self.logsdir = None
if self.logsdir is None: if self.logsdir is None:
self.logsdir = os.path.join(self.output_dir, "logs") self.logsdir = os.path.join(self.output_dir, "logs")
if self.xunit_file is None:
self.xunit_file = os.path.join(self.logsdir, "xunit.xml")
if self.dest is None: if self.dest is None:
self.dest = os.path.join(self.output_dir, "rendered") self.dest = os.path.join(self.output_dir, "rendered")
@ -446,8 +444,7 @@ Note that all testsuite should be inside python modules, so the directory should
"Directories and files to be used by the launcher") "Directories and files to be used by the launcher")
parser.add_argument('--xunit-file', action='store', parser.add_argument('--xunit-file', action='store',
dest='xunit_file', metavar="FILE", dest='xunit_file', metavar="FILE",
help=("Path to xml file to store the xunit report in. " help=("Path to xml file to store the xunit report in."))
"Default is LOGSDIR/xunit.xml"))
dir_group.add_argument("-M", "--main-dir", dest="main_dir", dir_group.add_argument("-M", "--main-dir", dest="main_dir",
help="Main directory where to put files. Default is %s" % DEFAULT_MAIN_DIR) help="Main directory where to put files. Default is %s" % DEFAULT_MAIN_DIR)
dir_group.add_argument("--testsuites-dir", dest="testsuites_dir", dir_group.add_argument("--testsuites-dir", dest="testsuites_dir",

View file

@ -69,7 +69,7 @@ class Reporter(Loggable):
self._start_time = time.time() self._start_time = time.time()
def set_failed(self, test): def set_failed(self, test):
self.stats["failure"] += 1 self.stats["failures"] += 1
def set_passed(self, test): def set_passed(self, test):
self.stats["passed"] += 1 self.stats["passed"] += 1