diff --git a/nova/test.py b/nova/test.py index 85c5501afb7c..82cd5c58c65c 100644 --- a/nova/test.py +++ b/nova/test.py @@ -26,6 +26,7 @@ eventlet.monkey_patch(os=False) import copy import gettext +import logging import os import shutil import sys @@ -44,7 +45,7 @@ from nova.network import manager as network_manager from nova.objects import base as objects_base from nova.openstack.common.fixture import logging as log_fixture from nova.openstack.common.fixture import moxstubout -from nova.openstack.common import log as logging +from nova.openstack.common import log as oslo_logging from nova.openstack.common import timeutils from nova import paths from nova import rpc @@ -69,7 +70,7 @@ CONF.import_opt('sqlite_db', 'nova.openstack.common.db.options', CONF.import_opt('enabled', 'nova.api.openstack', group='osapi_v3') CONF.set_override('use_stderr', False) -logging.setup('nova') +oslo_logging.setup('nova') _DB_CACHE = None _TRUE_VALUES = ('True', 'true', '1', 'yes') @@ -240,7 +241,9 @@ class TestCase(testtools.TestCase): self.addCleanup(rpc.cleanup) fs = '%(levelname)s [%(name)s] %(message)s' - self.log_fixture = self.useFixture(fixtures.FakeLogger(format=fs)) + self.log_fixture = self.useFixture(fixtures.FakeLogger( + level=logging.DEBUG, + format=fs)) self.useFixture(conf_fixture.ConfFixture(CONF)) self.messaging_conf = messaging_conffixture.ConfFixture(CONF) diff --git a/nova/tests/conf_fixture.py b/nova/tests/conf_fixture.py index 9b8f7efb8bfe..db9747a36050 100644 --- a/nova/tests/conf_fixture.py +++ b/nova/tests/conf_fixture.py @@ -60,7 +60,6 @@ class ConfFixture(config_fixture.Config): self.conf.set_default('connection', "sqlite://", group='database') self.conf.set_default('sqlite_synchronous', False, group='database') self.conf.set_default('use_ipv6', True) - self.conf.set_default('verbose', True) self.conf.set_default('vlan_interface', 'eth0') config.parse_args([], default_config_files=[]) self.addCleanup(utils.cleanup_dns_managers)