From 367fd3981a982eb239ec6f17e574a2cc172e30a2 Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Tue, 26 Jul 2011 13:16:34 -0700 Subject: [PATCH] Refactor config file reading. --- s3tests/common/__init__.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/s3tests/common/__init__.py b/s3tests/common/__init__.py index 0efda84..38189ee 100644 --- a/s3tests/common/__init__.py +++ b/s3tests/common/__init__.py @@ -84,6 +84,13 @@ def nuke_prefixed_buckets(): print 'Done with cleanup of test buckets.' +def read_config(fp): + config = bunch.Bunch() + g = yaml.safe_load_all(fp) + for new in g: + config.update(bunch.bunchify(new)) + return config + def setup(): global s3, config, prefix s3.clear() @@ -97,9 +104,7 @@ def setup(): + 'variable S3TEST_CONF to a config file.', ) with file(path) as f: - g = yaml.safe_load_all(f) - for new in g: - config.update(bunch.bunchify(new)) + config.update(read_config(f)) # These 3 should always be present. if 's3' not in config: