Merge "Fixes cfapi unit test conflicting with other tests." into stable/ocata
This commit is contained in:
commit
bc16101720
|
@ -529,6 +529,7 @@ class TestController(base.MuranoTestCase):
|
|||
|
||||
def _override_conf(self, without_urls=False):
|
||||
override = api.CONF.set_override
|
||||
clear_override = api.CONF.clear_override
|
||||
if without_urls:
|
||||
override('url', None, group='glare',
|
||||
enforce_type=True)
|
||||
|
@ -539,16 +540,16 @@ class TestController(base.MuranoTestCase):
|
|||
enforce_type=True)
|
||||
override('url', 'foo_murano_url', group='murano',
|
||||
enforce_type=True)
|
||||
override('packages_service', 'glance', group='engine',
|
||||
enforce_type=True)
|
||||
override('insecure', True, group='glare',
|
||||
enforce_type=True)
|
||||
override('key_file', 'foo_key_file', group='glare',
|
||||
enforce_type=True)
|
||||
override('ca_file', 'foo_ca_file', group='glare',
|
||||
enforce_type=True)
|
||||
override('cert_file', 'foo_cert_file', group='glare',
|
||||
enforce_type=True)
|
||||
self.addCleanup(clear_override, 'url', group='glare')
|
||||
self.addCleanup(clear_override, 'url', group='murano')
|
||||
for arg, group, override_val in (
|
||||
('packages_service', 'engine', 'glare'),
|
||||
('insecure', 'glare', True),
|
||||
('key_file', 'glare', 'foo_key_file'),
|
||||
('ca_file', 'glare', 'foo_ca_file'),
|
||||
('cert_file', 'glare', 'foo_cert_file')):
|
||||
override(arg, override_val, group=group, enforce_type=True)
|
||||
self.addCleanup(clear_override, arg, group=group)
|
||||
|
||||
def test_resource(self):
|
||||
self.assertIsInstance(api.create_resource(), wsgi.Resource)
|
||||
|
|
Loading…
Reference in New Issue