openstack/glance
Code Issues Proposed changes

Merge "Initialize CONF properly in store func tests"

Browse Source
This commit is contained in:
Jenkins 2013-01-30 22:32:51 +00:00 committed by Gerrit Code Review
commit f84c488274
2 changed files with 4 additions and 2 deletions
glance/tests/functional/store
test_s3.pytest_swift.py

3
glance/tests/functional/store/test_s3.py

@ -86,7 +86,8 @@ class TestS3Store(store_tests.BaseTestCase, testtools.TestCase):
msg = "GLANCE_TEST_S3_CONF environ not set."
self.skipTest(msg)
glance.openstack.common.cfg.CONF(default_config_files=[config_path])
glance.openstack.common.cfg.CONF(args=[],
default_config_files=[config_path])
raw_config = read_config(config_path)
config = parse_config(raw_config)

3
glance/tests/functional/store/test_swift.py

@ -153,7 +153,8 @@ class TestSwiftStore(store_tests.BaseTestCase, testtools.TestCase):
msg = "GLANCE_TEST_SWIFT_CONF environ not set."
self.skipTest(msg)
glance.openstack.common.cfg.CONF(default_config_files=[config_path])
glance.openstack.common.cfg.CONF(args=[],
default_config_files=[config_path])
raw_config = read_config(config_path)
config = parse_config(raw_config)