# 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 oslo_config import cfg
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."""

    def setUp(self):
        super(BaseTestCase, self).setUp()
        self.addCleanup(cfg.CONF.reset)

# 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."""

--- 
+++ 
@@ -12,6 +12,7 @@
 
 import contextlib
 
+from oslo_config import cfg
 from oslotest import base
 import six
 import testscenarios
@@ -29,5 +30,8 @@
 
 class BaseTestCase(testscenarios.WithScenarios,
                    base.BaseTestCase):
+    """Test case base class for all unit tests."""
 
-    """Test case base class for all unit tests."""
+    def setUp(self):
+        super(BaseTestCase, self).setUp()
+        self.addCleanup(cfg.CONF.reset)
Make sure any config overrides are reset

The new deploy unit tests have conf.set_override() but
don't reset these after each test, so depending on the
test order there are failures.

This just addes a generic cleanup in the base class to catch
all of them.

Change-Id: Idb1b4ef158808b08657f34bfe1546fa2ec0dae9f
