diff options
| author | Josh Durgin <josh.durgin@inktank.com> | 2013-07-19 23:44:51 +0200 |
|---|---|---|
| committer | Josh Durgin <josh.durgin@inktank.com> | 2013-07-19 23:44:51 +0200 |
| commit | bd56af707ae50c98ec46344cf57eb333061847b1 (patch) | |
| tree | b6e769b9c38a0f60bdb54749befa724cedc9207b | |
| parent | Merge pull request #15 from ceph/wip-ulimits (diff) | |
| parent | s3tests: fix client configurations that aren't dictionaries (diff) | |
| download | ceph-bd56af707ae50c98ec46344cf57eb333061847b1.tar.xz ceph-bd56af707ae50c98ec46344cf57eb333061847b1.zip | |
Merge branch 'wip-centos-rgw'
| -rw-r--r-- | s3tests.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/s3tests.py b/s3tests.py index abac99ede1c..700baeefebe 100644 --- 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) |