8bf335bb01
This patchset removes the lingering code that supported paste.deploy that is obsolted by the loader wrapped around keystone's use of Flask. * The keystone-paste.ini file has been removed. * All options have been removed (without deprecation) as they are no longer referenced. * The TokenAuthMiddleware code (with deprecation warning) has been removed as it was only provided to ensure compatibility with paste.ini files that were not updated (ensuring not breaking a deployer that did not update paste.ini file to remove it from the pipeline). * Paste deploy entrypoints have been removed. Change-Id: I35064a440ef718f50c7e644e8b2d56a99c3ec74f
78 lines
2.7 KiB
Python
78 lines
2.7 KiB
Python
# Copyright 2013 OpenStack Foundation
|
|
#
|
|
# 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.
|
|
|
|
import os
|
|
|
|
from oslo_config import generator
|
|
|
|
import keystone.conf
|
|
from keystone.tests import unit
|
|
|
|
|
|
CONF = keystone.conf.CONF
|
|
|
|
|
|
class ConfigTestCase(unit.TestCase):
|
|
|
|
def config_files(self):
|
|
config_files = super(ConfigTestCase, self).config_files()
|
|
|
|
sample_file = 'keystone.conf.sample'
|
|
args = ['--namespace', 'keystone', '--output-file',
|
|
unit.dirs.etc(sample_file)]
|
|
generator.main(args=args)
|
|
config_files.insert(0, unit.dirs.etc(sample_file))
|
|
self.addCleanup(os.remove, unit.dirs.etc(sample_file))
|
|
return config_files
|
|
|
|
def test_config_default(self):
|
|
self.assertIsNone(CONF.auth.password)
|
|
self.assertIsNone(CONF.auth.token)
|
|
|
|
def test_profiler_config_default(self):
|
|
"""Check config.set_config_defaults() has set [profiler]enabled."""
|
|
self.assertEqual(False, CONF.profiler.enabled)
|
|
|
|
|
|
class DeprecatedTestCase(unit.TestCase):
|
|
"""Test using the original (deprecated) name for renamed options."""
|
|
|
|
def config_files(self):
|
|
config_files = super(DeprecatedTestCase, self).config_files()
|
|
config_files.append(unit.dirs.tests_conf('deprecated.conf'))
|
|
return config_files
|
|
|
|
def test_sql(self):
|
|
# Options in [sql] were moved to [database] in Icehouse for the change
|
|
# to use oslo-incubator's db.sqlalchemy.sessions.
|
|
|
|
self.assertEqual('sqlite://deprecated', CONF.database.connection)
|
|
self.assertEqual(54321, CONF.database.idle_timeout)
|
|
|
|
|
|
class DeprecatedOverrideTestCase(unit.TestCase):
|
|
"""Test using the deprecated AND new name for renamed options."""
|
|
|
|
def config_files(self):
|
|
config_files = super(DeprecatedOverrideTestCase, self).config_files()
|
|
config_files.append(unit.dirs.tests_conf('deprecated_override.conf'))
|
|
return config_files
|
|
|
|
def test_sql(self):
|
|
# Options in [sql] were moved to [database] in Icehouse for the change
|
|
# to use oslo-incubator's db.sqlalchemy.sessions.
|
|
|
|
self.assertEqual('sqlite://new', CONF.database.connection)
|
|
self.assertEqual(65432, CONF.database.idle_timeout)
|