From 171cb69f136557f59250b82a7cd4726f86559643 Mon Sep 17 00:00:00 2001 From: Warren Usui Date: Wed, 20 Aug 2014 13:19:13 -0700 Subject: [PATCH] Fix return from schedule_suite. Schedule_suite returns the number of jobs scheduled (accounting for filters). Information displayed also indicates how many jobs were run and how many were filtered out. Fixes: 9183 Signed-off-by: Warren Usui --- teuthology/suite.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/teuthology/suite.py b/teuthology/suite.py index 31ed4fbb70..b32fc2a59b 100644 --- a/teuthology/suite.py +++ b/teuthology/suite.py @@ -454,8 +454,7 @@ def schedule_suite(job_config, log.debug('Suite %s in %s' % (suite_name, path)) configs = [(combine_path(suite_name, item[0]), item[1]) for item in build_matrix(path)] - job_count = len(configs) - log.info('Suite %s in %s generated %d jobs' % ( + log.info('Suite %s in %s generated %d jobs (not yet filtered)' % ( suite_name, path, len(configs))) for description, fragment_paths in configs: @@ -524,7 +523,10 @@ def schedule_suite(job_config, args=arg, ) count += 1 - return job_count + log.info('Suite %s in %s scheduled %d jobs.' % (suite_name, path, count)) + log.info('Suite %s in %s -- %d jobs were filtered out.' % (suite_name, + path, len(configs) - count)) + return count def combine_path(left, right): -- 2.39.5