tests: Clean up base test

This base test isn't actually used by anything but we're going to change
that shortly. Before we do, address a longstanding TODO and make it
subclass 'oslotest.BaseTestCase'. Because 'oslotest.BaseTestCase'
already configures all of the fixtures we're currently using, our own
base test class ends up being a simple wrapper. This will also change in
the future.

Change-Id: I110392586fb032507d122ae9a412a6bba7c5ff2d
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

1 files changed, 5 insertions, 37 deletions

diff --git a/oslo_db/tests/base.py b/oslo_db/tests/base.py
index 69e6a80..8d15666 100644
--- a/oslo_db/tests/base.py
+++ b/oslo_db/tests/base.py
@@ -1,11 +1,8 @@
-# Copyright 2010-2011 OpenStack Foundation
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
 # 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
+#     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
@@ -13,41 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import os
-
-import fixtures
-import testtools
-
-_TRUE_VALUES = ('true', '1', 'yes')
-
-# FIXME(dhellmann) Update this to use oslo.test library
-
+from oslotest import base
 
-class TestCase(testtools.TestCase):
 
-    """Test case base class for all unit tests."""
+class BaseTestCase(base.BaseTestCase):
+    """Test case base class for all oslo.db unit tests."""
 
     def setUp(self):
         """Run before each test method to initialize test environment."""
-
-        super(TestCase, self).setUp()
-        test_timeout = os.environ.get('OS_TEST_TIMEOUT', 0)
-        try:
-            test_timeout = int(test_timeout)
-        except ValueError:
-            # If timeout value is invalid do not set a timeout.
-            test_timeout = 0
-        if test_timeout > 0:
-            self.useFixture(fixtures.Timeout(test_timeout, gentle=True))
-
-        self.useFixture(fixtures.NestedTempfile())
-        self.useFixture(fixtures.TempHomeDir())
-
-        if os.environ.get('OS_STDOUT_CAPTURE') in _TRUE_VALUES:
-            stdout = self.useFixture(fixtures.StringStream('stdout')).stream
-            self.useFixture(fixtures.MonkeyPatch('sys.stdout', stdout))
-        if os.environ.get('OS_STDERR_CAPTURE') in _TRUE_VALUES:
-            stderr = self.useFixture(fixtures.StringStream('stderr')).stream
-            self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
-
-        self.log_fixture = self.useFixture(fixtures.FakeLogger())
+        super().setUp()