Use oslo.log fixture

BaseTestCase used its own log fixture. Use the fixture provided
by oslo.log instead.

Change-Id: I03f12969e17f4d8694662bd3cbca034d90b57bb0
This commit is contained in:
Nina Goradia 2015-08-26 14:07:15 -05:00
parent aa8dc5c9c5
commit 482d5e8ec6
2 changed files with 3 additions and 8 deletions

View File

@ -28,6 +28,7 @@ import warnings
import fixtures
from oslo_config import cfg
from oslo_config import fixture as config_fixture
from oslo_log import fixture as log_fixture
from oslo_log import log
from oslo_utils import timeutils
import oslotest.base as oslotest
@ -223,11 +224,6 @@ class UnexpectedExit(Exception):
pass
class BadLog(Exception):
"""Raised on invalid call to logging (parameter mismatch)."""
pass
class TestClient(object):
def __init__(self, app=None, token=None):
self.app = app
@ -402,8 +398,7 @@ class BaseTestCase(oslotest.BaseTestCase):
super(BaseTestCase, self).setUp()
self.useFixture(mockpatch.PatchObject(sys, 'exit',
side_effect=UnexpectedExit))
self.useFixture(mockpatch.PatchObject(logging.Handler, 'handleError',
side_effect=BadLog))
self.useFixture(log_fixture.get_logging_handle_error_fixture())
warnings.filterwarnings('error', category=DeprecationWarning,
module='^keystone\\.')

View File

@ -40,7 +40,7 @@ class TestTestCase(unit.TestCase):
# exception during testing.
self.assertThat(
lambda: LOG.warn('String %(p1)s %(p2)s', {'p1': 'something'}),
matchers.raises(unit.BadLog))
matchers.raises(KeyError))
def test_sa_warning(self):
self.assertThat(