
The cfg API is now available via the oslo-config library, so switch to it and remove the copied-and-pasted version. Add the 2013.1b3 tarball to tools/pip-requires - this will be changed to 'oslo-config>=2013.1' when oslo-config is published to pypi. This will happen in time for grizzly final. For each testenv in tox.ini which overrides the base testenv deps list, explicitly include {pip,test}-requires in the list so that oslo-config doesn't fail to install later when easy_install attempts to install the tarball when doing 'python setup.py install'. Retain dummy cfg.py file until keystoneclient middleware has been updated (I18c450174277c8e2d15ed93879da6cd92074c27a). Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
51 lines
1.6 KiB
Python
51 lines
1.6 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2013 Julien Danjou
|
|
#
|
|
# Author: Julien Danjou <julien@danjou.info>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
"""Test basic ceilometer-api app
|
|
"""
|
|
import os
|
|
import tempfile
|
|
import unittest
|
|
|
|
from oslo.config import cfg
|
|
|
|
from ceilometer.api import app
|
|
from ceilometer.api import acl
|
|
from ceilometer import service
|
|
|
|
|
|
class TestApp(unittest.TestCase):
|
|
|
|
def tearDown(self):
|
|
cfg.CONF.reset()
|
|
|
|
def test_keystone_middleware_conf(self):
|
|
cfg.CONF.set_override("auth_protocol", "foottp",
|
|
group=acl.OPT_GROUP_NAME)
|
|
api_app = app.setup_app()
|
|
self.assertEqual(api_app.auth_protocol, 'foottp')
|
|
|
|
def test_keystone_middleware_parse_conffile(self):
|
|
tmpfile = tempfile.mktemp()
|
|
with open(tmpfile, "w") as f:
|
|
f.write("[%s]\nauth_protocol = barttp" % acl.OPT_GROUP_NAME)
|
|
service.prepare_service(['ceilometer-api',
|
|
'--config-file=%s' % tmpfile])
|
|
api_app = app.setup_app()
|
|
self.assertEqual(api_app.auth_protocol, 'barttp')
|
|
os.unlink(tmpfile)
|