From 7845848c0fae6750bdc3556d11bb599ef206e9c0 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Tue, 9 Jul 2013 18:50:52 -0700 Subject: [PATCH] s3tests: fix client configurations that aren't dictionaries They're always used as dictionaries later on. Signed-off-by: Josh Durgin --- teuthology/task/s3tests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/teuthology/task/s3tests.py b/teuthology/task/s3tests.py index abac99ede1cb8..700baeefebe94 100644 --- a/teuthology/task/s3tests.py +++ b/teuthology/task/s3tests.py @@ -219,8 +219,10 @@ def task(ctx, config): overrides = ctx.config.get('overrides', {}) # merge each client section, not the top level. - for (client, cconf) in config.iteritems(): - teuthology.deep_merge(cconf, overrides.get('s3tests', {})) + for client in config.iterkeys(): + if not config[client]: + config[client] = {} + teuthology.deep_merge(config[client], overrides.get('s3tests', {})) log.debug('config is %s', config) -- 2.39.5