diff --git a/tests/scripts/analyze_outcomes.py b/tests/scripts/analyze_outcomes.py index 7b09bb5241..090fd0edbb 100755 --- a/tests/scripts/analyze_outcomes.py +++ b/tests/scripts/analyze_outcomes.py @@ -20,25 +20,18 @@ class Results: self.error_count = 0 self.warning_count = 0 - # Private method @staticmethod - def __log(fmt, *args, **kwargs): + def log(fmt, *args, **kwargs): sys.stderr.write((fmt + '\n').format(*args, **kwargs)) def error(self, fmt, *args, **kwargs): - self.__log('Error: ' + fmt, *args, **kwargs) + self.log('Error: ' + fmt, *args, **kwargs) self.error_count += 1 def warning(self, fmt, *args, **kwargs): - self.__log('Warning: ' + fmt, *args, **kwargs) + self.log('Warning: ' + fmt, *args, **kwargs) self.warning_count += 1 - # This is a static method because we don't need to track any data about - # the number of times it is called - @staticmethod - def info(fmt, *args, **kwargs): - Results.__log(fmt, *args, **kwargs) - class TestCaseOutcomes: """The outcomes of one test case across many configurations.""" # pylint: disable=too-few-public-methods @@ -103,7 +96,7 @@ def analyze_driver_vs_reference(outcomes, component_ref, component_driver, if component_ref in entry: reference_test_passed = True if(reference_test_passed and not driver_test_passed): - Results.info(key) + Results.log(key) result = False return result @@ -138,7 +131,7 @@ def do_analyze_coverage(outcome_file, args): """Perform coverage analysis.""" del args # unused outcomes = read_outcome_file(outcome_file) - Results.info("\n*** Analyze coverage ***\n") + Results.log("\n*** Analyze coverage ***\n") results = analyze_outcomes(outcomes) return results.error_count == 0 @@ -147,7 +140,7 @@ def do_analyze_driver_vs_reference(outcome_file, args): ignored_suites = ['test_suite_' + x for x in args['ignored_suites']] outcomes = read_outcome_file(outcome_file) - Results.info("\n*** Analyze driver {} vs reference {} ***\n".format( + Results.log("\n*** Analyze driver {} vs reference {} ***\n".format( args['component_driver'], args['component_ref'])) return analyze_driver_vs_reference(outcomes, args['component_ref'], args['component_driver'], ignored_suites, @@ -208,7 +201,7 @@ def main(): if options.list: for task in TASKS: - Results.info(task) + Results.log(task) sys.exit(0) result = True @@ -220,7 +213,7 @@ def main(): for task in tasks: if task not in TASKS: - Results.info('Error: invalid task: {}'.format(task)) + Results.log('Error: invalid task: {}'.format(task)) sys.exit(1) for task in TASKS: @@ -230,7 +223,7 @@ def main(): if result is False: sys.exit(1) - Results.info("SUCCESS :-)") + Results.log("SUCCESS :-)") except Exception: # pylint: disable=broad-except # Print the backtrace and exit explicitly with our chosen status. traceback.print_exc()