diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-07-25 00:31:31 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-07-25 00:31:31 +0000 |
commit | b1f340895167c401416061e34cde66fff4fd4ad3 (patch) | |
tree | 3a07ef6c3b60069ddcf7d64092bb575d5b9b4529 | |
parent | 53a7e4437dfd3a399d53cd68383dc473ac2b9451 (diff) | |
parent | bc8d742e8d80e4fcd1af99420a199793364c01e0 (diff) | |
download | keystonemiddleware-b1f340895167c401416061e34cde66fff4fd4ad3.tar.gz |
Merge "Clean up openstack-common.conf"
-rw-r--r-- | keystonemiddleware/openstack/common/fixture/__init__.py | 0 | ||||
-rw-r--r-- | keystonemiddleware/openstack/common/fixture/config.py | 85 | ||||
-rw-r--r-- | openstack-common.conf | 2 |
3 files changed, 0 insertions, 87 deletions
diff --git a/keystonemiddleware/openstack/common/fixture/__init__.py b/keystonemiddleware/openstack/common/fixture/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/keystonemiddleware/openstack/common/fixture/__init__.py +++ /dev/null diff --git a/keystonemiddleware/openstack/common/fixture/config.py b/keystonemiddleware/openstack/common/fixture/config.py deleted file mode 100644 index 9489b85..0000000 --- a/keystonemiddleware/openstack/common/fixture/config.py +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright 2013 Mirantis, Inc. -# Copyright 2013 OpenStack Foundation -# All Rights Reserved. -# -# 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 fixtures -from oslo.config import cfg -import six - - -class Config(fixtures.Fixture): - """Allows overriding configuration settings for the test. - - `conf` will be reset on cleanup. - - """ - - def __init__(self, conf=cfg.CONF): - self.conf = conf - - def setUp(self): - super(Config, self).setUp() - # NOTE(morganfainberg): unregister must be added to cleanup before - # reset is because cleanup works in reverse order of registered items, - # and a reset must occur before unregistering options can occur. - self.addCleanup(self._unregister_config_opts) - self.addCleanup(self.conf.reset) - self._registered_config_opts = {} - - def config(self, **kw): - """Override configuration values. - - The keyword arguments are the names of configuration options to - override and their values. - - If a `group` argument is supplied, the overrides are applied to - the specified configuration option group, otherwise the overrides - are applied to the ``default`` group. - - """ - - group = kw.pop('group', None) - for k, v in six.iteritems(kw): - self.conf.set_override(k, v, group) - - def _unregister_config_opts(self): - for group in self._registered_config_opts: - self.conf.unregister_opts(self._registered_config_opts[group], - group=group) - - def register_opt(self, opt, group=None): - """Register a single option for the test run. - - Options registered in this manner will automatically be unregistered - during cleanup. - - If a `group` argument is supplied, it will register the new option - to that group, otherwise the option is registered to the ``default`` - group. - """ - self.conf.register_opt(opt, group=group) - self._registered_config_opts.setdefault(group, set()).add(opt) - - def register_opts(self, opts, group=None): - """Register multiple options for the test run. - - This works in the same manner as register_opt() but takes a list of - options as the first argument. All arguments will be registered to the - same group if the ``group`` argument is supplied, otherwise all options - will be registered to the ``default`` group. - """ - for opt in opts: - self.register_opt(opt, group=group) diff --git a/openstack-common.conf b/openstack-common.conf index e6f394c..2dc8fb8 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -2,10 +2,8 @@ # The list of modules to copy from oslo-incubator module=install_venv_common -module=fixture.config module=jsonutils module=memorycache -module=strutils module=timeutils # The base module to hold the copy of openstack.common |