s3tests: fix client configurations that aren't dictionaries

They're always used as dictionaries later on.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/s3tests.py b/s3tests.py
index abac99ede1cb8d9c483d1acba9513cb2c5bf8487..700baeefebe94a8b41f2456ab39230058ef172ec 100644 (file)
--- a/s3tests.py
+++ b/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)