diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py index 5d46c5210b..852f737df3 100644 --- a/validate/launcher/baseclasses.py +++ b/validate/launcher/baseclasses.py @@ -1226,7 +1226,10 @@ class _TestsLauncher(Loggable): globals()["__file__"] = c__file__ 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 wanted_testers = None diff --git a/validate/launcher/main.py b/validate/launcher/main.py index 4204f32430..a0f3228d69 100644 --- a/validate/launcher/main.py +++ b/validate/launcher/main.py @@ -251,8 +251,6 @@ class LauncherConfig(Loggable): self.logsdir = None if self.logsdir is None: 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: 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") parser.add_argument('--xunit-file', action='store', dest='xunit_file', metavar="FILE", - help=("Path to xml file to store the xunit report in. " - "Default is LOGSDIR/xunit.xml")) + help=("Path to xml file to store the xunit report in.")) dir_group.add_argument("-M", "--main-dir", dest="main_dir", help="Main directory where to put files. Default is %s" % DEFAULT_MAIN_DIR) dir_group.add_argument("--testsuites-dir", dest="testsuites_dir", diff --git a/validate/launcher/reporters.py b/validate/launcher/reporters.py index d73e0ef292..9ee58aadf8 100644 --- a/validate/launcher/reporters.py +++ b/validate/launcher/reporters.py @@ -69,7 +69,7 @@ class Reporter(Loggable): self._start_time = time.time() def set_failed(self, test): - self.stats["failure"] += 1 + self.stats["failures"] += 1 def set_passed(self, test): self.stats["passed"] += 1