openstack
/
cinder
Code Issues Proposed changes

Merge "Use debug level logging during unit tests"

This commit is contained in:
Jenkins 2014-03-13 22:50:26 +00:00 committed by Gerrit Code Review
parent ef3251623c 365a9908b8
commit 4c396f8d45
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/test.py
View File

@ -27,6 +27,7 @@ import tempfile
import uuid
import fixtures
import logging
import mox
from oslo.config import cfg
from oslo.messaging import conffixture as messaging_conffixture
@ -37,7 +38,7 @@ from testtools import matchers
from cinder.common import config # noqa Need to register global_opts
from cinder.db import migration
from cinder.openstack.common.db.sqlalchemy import session
from cinder.openstack.common import log as logging
from cinder.openstack.common import log as oslo_logging
from cinder.openstack.common import timeutils
from cinder import rpc
from cinder import service
@ -52,7 +53,7 @@ test_opts = [
CONF = cfg.CONF
CONF.register_opts(test_opts)
LOG = logging.getLogger(__name__)
LOG = oslo_logging.getLogger(__name__)
_DB_CACHE = None
@ -129,7 +130,8 @@ class TestCase(testtools.TestCase):
stderr = self.useFixture(fixtures.StringStream('stderr')).stream
self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
self.log_fixture = self.useFixture(fixtures.FakeLogger())
self.log_fixture = self.useFixture(fixtures.FakeLogger(
level=logging.DEBUG))
rpc.add_extra_exmods("cinder.tests")
self.addCleanup(rpc.clear_extra_exmods)

1
cinder/tests/conf_fixture.py
View File

@ -41,7 +41,6 @@ def set_defaults(conf):
conf.set_default('fake_rabbit', True)
conf.set_default('rpc_backend', 'cinder.openstack.common.rpc.impl_fake')
conf.set_default('iscsi_num_targets', 8)
conf.set_default('verbose', True)
conf.set_default('connection', 'sqlite://', group='database')
conf.set_default('sqlite_synchronous', False)
conf.set_default('policy_file', 'cinder/tests/policy.json')