From 21e7dfc71269e9dcb4b9b5423e3c99c2bb0d16d7 Mon Sep 17 00:00:00 2001 From: Nathaniel Manista Date: Sun, 12 Mar 2017 18:24:09 +0000 Subject: [PATCH] Ignore the number of failed skipped tests jobset.run was changed on 16 October 2015 in e4c3561074ca27fc4bdf1a6bf to return the number of failures and the result set. On 20 October 2016 in 5c691c634de144b50fc1f2e166303219721c19d0 jobset.run was changed to allow jobs to be skipped, but the introduced code path only returned the result set, giving jobset.run inconsistent return value semantics. On 24 October 2016 7e9bd6ca9a2e167dcb6133c78c05cf27584ee062 introduced a use of jobset.run's "skip_jobs" return value semantics, and on 8 March 2017 d159af31fcf300cfe2d7b9b41d789cd664ee4f1b resolved jobset.run's inconsistent return value semantics but failed to correct run_tests_matrix's use of the inconsistent "skip_jobs" return value semantics. --- tools/run_tests/run_tests_matrix.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 47422451f8d..96075269204 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -415,8 +415,8 @@ if __name__ == "__main__": maxjobs=args.jobs) # Merge skipped tests into results to show skipped tests on report.xml if skipped_jobs: - skipped_results = jobset.run(skipped_jobs, - skip_jobs=True) + ignored_num_skipped_failures, skipped_results = jobset.run( + skipped_jobs, skip_jobs=True) resultset.update(skipped_results) report_utils.render_junit_xml_report(resultset, 'report_%s' % _REPORT_SUFFIX, suite_name='aggregate_tests')