openstack/aodh
Code Issues Proposed changes

Merge "keystone client changes in AuthProtocol made our test cases failing"

Browse Source
This commit is contained in:
Jenkins 2013-10-01 17:43:48 +00:00 committed by Gerrit Code Review
commit 0dcc4900ef
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/api/v1/test_app.py
View File

@ -37,8 +37,10 @@ class TestApp(base.TestCase):
cfg.CONF.set_override("auth_protocol", "foottp",
group=acl.OPT_GROUP_NAME)
cfg.CONF.set_override("auth_version", "v2.0", group=acl.OPT_GROUP_NAME)
cfg.CONF.set_override("auth_uri", None,
group=acl.OPT_GROUP_NAME)
api_app = app.make_app(cfg.CONF, attach_storage=False)
self.assertEqual(api_app.wsgi_app.auth_protocol, 'foottp')
self.assertTrue(api_app.wsgi_app.auth_uri.startswith('foottp'))
def test_keystone_middleware_parse_conffile(self):
tmpfile = self.temp_config_file_path()
@ -48,5 +50,5 @@ class TestApp(base.TestCase):
service.prepare_service(['ceilometer-api',
'--config-file=%s' % tmpfile])
api_app = app.make_app(cfg.CONF, attach_storage=False)
self.assertEqual(api_app.wsgi_app.auth_protocol, 'barttp')
self.assertTrue(api_app.wsgi_app.auth_uri.startswith('barttp'))
os.unlink(tmpfile)

6
tests/api/v2/test_app.py
View File

@ -44,8 +44,10 @@ class TestApp(base.TestCase):
cfg.CONF.set_override("pipeline_cfg_file",
self.path_get("etc/ceilometer/pipeline.yaml"))
cfg.CONF.set_override('connection', "log://", group="database")
cfg.CONF.set_override("auth_uri", None, group=acl.OPT_GROUP_NAME)
api_app = app.setup_app()
self.assertEqual(api_app.auth_protocol, 'foottp')
self.assertTrue(api_app.auth_uri.startswith('foottp'))
def test_keystone_middleware_parse_conffile(self):
tmpfile = self.temp_config_file_path()
@ -60,7 +62,7 @@ class TestApp(base.TestCase):
'--config-file=%s' % tmpfile])
cfg.CONF.set_override('connection', "log://", group="database")
api_app = app.setup_app()
self.assertEqual(api_app.auth_protocol, 'barttp')
self.assertTrue(api_app.auth_uri.startswith('barttp'))
os.unlink(tmpfile)