# 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 contextlib

from oslotest import base
import six
import testscenarios


# Python 3, thank you for dropping contextlib.nested
if six.PY3:
    @contextlib.contextmanager
    def nested(*contexts):
        with contextlib.ExitStack() as stack:
            yield [stack.enter_context(c) for c in contexts]
else:
    nested = contextlib.nested


class BaseTestCase(testscenarios.WithScenarios,
                   base.BaseTestCase):

    """Test case base class for all unit tests."""

@@ -558,16 +558,44 @@
 extlib%0A%0A
+from oslo_config import cfg%0A
 from osl
@@ -1002,17 +1002,16 @@
 tCase):%0A
-%0A
     %22%22%22T
@@ -1053,8 +1053,112 @@
 sts.%22%22%22%0A
+%0A    def setUp(self):%0A        super(BaseTestCase, self).setUp()%0A        self.addCleanup(cfg.CONF.reset)%0A

Make sure any config overrides are reset