Merge "Use oslo_config.fixture in unit tests"

ironic/tests/base.py

@@ -30,20 +30,19 @@ import eventlet
 eventlet.monkey_patch(os=False)
 import fixtures
 from oslo_config import cfg
+from oslo_config import fixture as config_fixture
 from oslo_context import context as ironic_context
 from oslo_log import log as logging
 import testtools
 
+from ironic.common import config as ironic_config
 from ironic.common import hash_ring
 from ironic.objects import base as objects_base
-from ironic.tests.unit import conf_fixture
 from ironic.tests.unit import policy_fixture
 
 
 CONF = cfg.CONF
 logging.register_options(CONF)
-CONF.set_override('use_stderr', False)
-
 logging.setup(CONF, 'ironic')
 
 
@@ -85,7 +84,6 @@ class TestCase(testtools.TestCase):
             self.useFixture(fixtures.Timeout(test_timeout, gentle=True))
         self.useFixture(fixtures.NestedTempfile())
         self.useFixture(fixtures.TempHomeDir())
-        self.config(tempdir=tempfile.tempdir)
 
         if (os.environ.get('OS_STDOUT_CAPTURE') == 'True' or
                 os.environ.get('OS_STDOUT_CAPTURE') == '1'):
@@ -97,8 +95,7 @@ class TestCase(testtools.TestCase):
             self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
 
         self.log_fixture = self.useFixture(fixtures.FakeLogger())
-        self.useFixture(conf_fixture.ConfFixture(CONF))
-
+        self._set_config()
         # NOTE(danms): Make sure to reset us back to non-remote objects
         # for each test to avoid interactions. Also, backup the object
         # registry
@@ -111,7 +108,18 @@ class TestCase(testtools.TestCase):
         self.addCleanup(hash_ring.HashRingManager().reset)
         self.useFixture(fixtures.EnvironmentVariable('http_proxy'))
         self.policy = self.useFixture(policy_fixture.PolicyFixture())
-        CONF.set_override('fatal_exception_format_errors', True)
+
+    def _set_config(self):
+        self.cfg_fixture = self.useFixture(config_fixture.Config(CONF))
+        self.config(use_stderr=False,
+                    fatal_exception_format_errors=True,
+                    tempdir=tempfile.tempdir)
+        self.set_defaults(host='fake-mini',
+                          verbose=True)
+        self.set_defaults(connection="sqlite://",
+                          sqlite_synchronous=False,
+                          group='database')
+        ironic_config.parse_args([], default_config_files=[])
 
     def _restore_obj_registry(self):
         objects_base.IronicObjectRegistry._registry._obj_classes = (
@@ -126,9 +134,13 @@ class TestCase(testtools.TestCase):
 
     def config(self, **kw):
         """Override config options for a test."""
+        self.cfg_fixture.config(**kw)
+
+    def set_defaults(self, **kw):
+        """Set default values of config options."""
         group = kw.pop('group', None)
-        for k, v in kw.items():
-            CONF.set_override(k, v, group)
+        for o, v in kw.items():
+            self.cfg_fixture.set_default(o, v, group=group)
 
     def path_get(self, project_file=None):
         """Get the absolute path to a file. Used for testing the API.

ironic/tests/unit/conf_fixture.py

@@ -1,40 +0,0 @@
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# 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
-
-from ironic.common import config
-
-CONF = cfg.CONF
-CONF.import_opt('host', 'ironic.common.service')
-
-
-class ConfFixture(fixtures.Fixture):
-    """Fixture to manage global conf settings."""
-
-    def __init__(self, conf):
-        self.conf = conf
-
-    def setUp(self):
-        super(ConfFixture, self).setUp()
-
-        self.conf.set_default('host', 'fake-mini')
-        self.conf.set_default('connection', "sqlite://", group='database')
-        self.conf.set_default('sqlite_synchronous', False, group='database')
-        self.conf.set_default('verbose', True)
-        config.parse_args([], default_config_files=[])
-        self.addCleanup(self.conf.reset)