test cleanup: Make base TestCase subclass oslotest
oslotest.base.BaseTestCase already sets up many of the fixtures we want from nova.test.TestCase, so inherit from it and remove those setups. Note that oslotest has a logger fixture, but nova's is significantly different, so we preserve the latter. Fortunately, oslotest provides a granny switch to disable its logger fixture -- the OS_LOG_CAPTURE env var -- so we explicitly do that, even though it's not on in our tox.ini, in case we accidentally run in an env where that's enabled. Change-Id: Ic61c3db824ec811336423bd956f2f2f03e02d21e
This commit is contained in:
parent
a039827876
commit
ccf7eabdf8
22
nova/test.py
22
nova/test.py
|
@ -45,10 +45,9 @@ from oslo_serialization import jsonutils
|
|||
from oslo_utils.fixture import uuidsentinel as uuids
|
||||
from oslo_utils import timeutils
|
||||
from oslo_versionedobjects import fixture as ovo_fixture
|
||||
from oslotest import base
|
||||
from oslotest import mock_fixture
|
||||
from oslotest import moxstubout
|
||||
from oslotest import output
|
||||
from oslotest import timeout
|
||||
import six
|
||||
from six.moves import builtins
|
||||
import testtools
|
||||
|
@ -150,7 +149,7 @@ class NovaExceptionReraiseFormatError(object):
|
|||
NovaExceptionReraiseFormatError.patch()
|
||||
|
||||
|
||||
class TestCase(testtools.TestCase):
|
||||
class TestCase(base.BaseTestCase):
|
||||
"""Test case base class for all unit tests.
|
||||
|
||||
Due to the slowness of DB access, please consider deriving from
|
||||
|
@ -174,25 +173,18 @@ class TestCase(testtools.TestCase):
|
|||
# base class when USES_DB is True.
|
||||
NUMBER_OF_CELLS = 1
|
||||
|
||||
TIMEOUT_SCALING_FACTOR = 1
|
||||
|
||||
def setUp(self):
|
||||
"""Run before each test method to initialize test environment."""
|
||||
super(TestCase, self).setUp()
|
||||
# The Timeout fixture picks up env.OS_TEST_TIMEOUT, defaulting to 0.
|
||||
self.useFixture(timeout.Timeout(
|
||||
scaling_factor=self.TIMEOUT_SCALING_FACTOR))
|
||||
# Ensure BaseTestCase's ConfigureLogging fixture is disabled since
|
||||
# we're using our own (StandardLogging).
|
||||
with fixtures.EnvironmentVariable('OS_LOG_CAPTURE', '0'):
|
||||
super(TestCase, self).setUp()
|
||||
|
||||
self.useFixture(nova_fixtures.OpenStackSDKFixture())
|
||||
|
||||
self.useFixture(fixtures.NestedTempfile())
|
||||
self.useFixture(fixtures.TempHomeDir())
|
||||
self.useFixture(log_fixture.get_logging_handle_error_fixture())
|
||||
|
||||
self.output = self.useFixture(output.CaptureOutput())
|
||||
|
||||
self.stdlog = nova_fixtures.StandardLogging()
|
||||
self.useFixture(self.stdlog)
|
||||
self.stdlog = self.useFixture(nova_fixtures.StandardLogging())
|
||||
|
||||
# NOTE(sdague): because of the way we were using the lock
|
||||
# wrapper we ended up with a lot of tests that started
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
import os
|
||||
import tempfile
|
||||
|
||||
import fixtures
|
||||
import mock
|
||||
from oslo_config import cfg
|
||||
|
||||
|
@ -42,7 +41,6 @@ class ConfTest(test.NoDBTestCase):
|
|||
|
||||
def setUp(self):
|
||||
super(ConfTest, self).setUp()
|
||||
self.useFixture(fixtures.NestedTempfile())
|
||||
self.conf = self.TestConfigOpts()
|
||||
self.tempdirs = []
|
||||
|
||||
|
|
Loading…
Reference in New Issue