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


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)

Make sure any config overrides are 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

  
  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)
+ 
Make sure any config overrides are reset
## Code Before:

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

## Instruction:
Make sure any config overrides are reset
## Code After:

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)
