From 9129545a58f3a723ac429af814cb720b4ffbd0eb Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 26 Sep 2014 10:52:12 -0400 Subject: [PATCH] Use fixture from oslo.config instead of oslo-incubator Change-Id: Ic80562c662960a946b3083f0509700e4809d628d --- openstack-common.conf | 1 - oslo/db/openstack/__init__.py | 0 oslo/db/openstack/common/__init__.py | 12 --- oslo/db/openstack/common/fixture/__init__.py | 0 oslo/db/openstack/common/fixture/config.py | 85 -------------------- tests/sqlalchemy/test_options.py | 2 +- 6 files changed, 1 insertion(+), 99 deletions(-) delete mode 100644 oslo/db/openstack/__init__.py delete mode 100644 oslo/db/openstack/common/__init__.py delete mode 100644 oslo/db/openstack/common/fixture/__init__.py delete mode 100644 oslo/db/openstack/common/fixture/config.py diff --git a/openstack-common.conf b/openstack-common.conf index f305e6f..44767a1 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -1,7 +1,6 @@ [DEFAULT] # The list of modules to copy from oslo-incubator.git -module=fixture.config script = tools/run_cross_tests.sh # The base module to hold the copy of openstack.common diff --git a/oslo/db/openstack/__init__.py b/oslo/db/openstack/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/oslo/db/openstack/common/__init__.py b/oslo/db/openstack/common/__init__.py deleted file mode 100644 index 9dd8c3a..0000000 --- a/oslo/db/openstack/common/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -# -# 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. diff --git a/oslo/db/openstack/common/fixture/__init__.py b/oslo/db/openstack/common/fixture/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/oslo/db/openstack/common/fixture/config.py b/oslo/db/openstack/common/fixture/config.py deleted file mode 100644 index 9489b85..0000000 --- a/oslo/db/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/tests/sqlalchemy/test_options.py b/tests/sqlalchemy/test_options.py index aa882ad..51bf470 100644 --- a/tests/sqlalchemy/test_options.py +++ b/tests/sqlalchemy/test_options.py @@ -12,8 +12,8 @@ # under the License. from oslo.config import cfg +from oslo.config import fixture as config -from oslo.db.openstack.common.fixture import config from oslo.db import options from tests import utils as test_utils