diff options
author | Thiago da Silva <thiago@redhat.com> | 2013-11-04 17:08:22 -0500 |
---|---|---|
committer | Luis Pabon <lpabon@redhat.com> | 2013-11-13 13:00:31 -0800 |
commit | b0497ce11d8d059d9b9a0f9651544c7725cd1d2e (patch) | |
tree | 02afd0dbc94f24495e6ef0cbd8dab7f9298c744f /test | |
parent | 48046e5822cae3474ec332266f236e917e7f10a4 (diff) |
make gluster volume name configurable
changed code to look at configuration file for
the metadata gluster volume name. The default is still
gsmetadata
Change-Id: I9bf74b9566ea1c9716c42f7ced0f999e02824868
Signed-off-by: Thiago da Silva <thiago@redhat.com>
Reviewed-on: http://review.gluster.org/6225
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/6258
Diffstat (limited to 'test')
-rw-r--r-- | test/functional_auth/gswauth/conf/proxy-server.conf | 1 | ||||
-rw-r--r-- | test/unit/common/middleware/gswauth/swauth/test_middleware.py | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/test/functional_auth/gswauth/conf/proxy-server.conf b/test/functional_auth/gswauth/conf/proxy-server.conf index ddb0290..90beb51 100644 --- a/test/functional_auth/gswauth/conf/proxy-server.conf +++ b/test/functional_auth/gswauth/conf/proxy-server.conf @@ -64,6 +64,7 @@ user_test_tester3 = testing3 use = egg:gluster_swift#swauth set log_name = swauth super_admin_key = swauthkey +metadata_volume = gsmetadata [filter:cache] use = egg:swift#memcache diff --git a/test/unit/common/middleware/gswauth/swauth/test_middleware.py b/test/unit/common/middleware/gswauth/swauth/test_middleware.py index 71c57ab..9ecd7d6 100644 --- a/test/unit/common/middleware/gswauth/swauth/test_middleware.py +++ b/test/unit/common/middleware/gswauth/swauth/test_middleware.py @@ -194,6 +194,20 @@ class TestAuth(unittest.TestCase): 'Invalid auth_type in config file: %s' % 'Nonexistant') + def test_default_metadata_volume_init(self): + app = FakeApp() + ath = auth.filter_factory({})(app) + self.assertEquals(ath.metadata_volume, 'gsmetadata') + + def test_conf_metadata_volume_init(self): + app = FakeApp() + ath = auth.filter_factory( + {'metadata_volume': 'meta_test'})(app) + self.assertEquals(ath.metadata_volume, 'meta_test') + ath = auth.filter_factory( + {'metadata_volume': 'new_meta_volume'})(app) + self.assertEquals(ath.metadata_volume, 'new_meta_volume') + def test_default_swift_cluster_init(self): app = FakeApp() self.assertRaises(Exception, auth.filter_factory({ |