From 743edd6b70aaf37eec5917850a7ba1df3e9aa19b Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 24 Jun 2014 09:13:30 -0600 Subject: [PATCH] Fix a couple linter errors Signed-off-by: Zack Cerza --- teuthology/schedule.py | 2 +- teuthology/suite.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/teuthology/schedule.py b/teuthology/schedule.py index 3338e24a37..18dad4921c 100644 --- a/teuthology/schedule.py +++ b/teuthology/schedule.py @@ -1,7 +1,7 @@ import yaml import teuthology.beanstalk -from teuthology.misc import config_file, deep_merge, get_user +from teuthology.misc import deep_merge, get_user from teuthology import report diff --git a/teuthology/suite.py b/teuthology/suite.py index 88120dfe2d..a80286f6c3 100644 --- a/teuthology/suite.py +++ b/teuthology/suite.py @@ -339,13 +339,13 @@ def schedule_suite(name, log.info('Suite %s in %s generated %d jobs' % ( name, path, len(configs))) - for description, config in configs: + for description, fragment_paths in configs: if limit > 0 and count >= limit: log.info( 'Stopped after {limit} jobs due to --limit={limit}'.format( limit=limit)) break - raw_yaml = '\n'.join([file(a, 'r').read() for a in config]) + raw_yaml = '\n'.join([file(a, 'r').read() for a in fragment_paths]) parsed_yaml = yaml.load(raw_yaml) os_type = parsed_yaml.get('os_type') @@ -379,7 +379,7 @@ def schedule_suite(name, '--', ]) arg.extend(base_yamls) - arg.extend(config) + arg.extend(fragment_paths) if dry_run: # Quote any individual args so that individual commands can be -- 2.39.5