This commit is contained in:
Todd Willey
2011-01-06 15:08:14 -05:00
parent d12beb3a64
commit ecff918d43
2 changed files with 7 additions and 5 deletions

View File

@@ -74,7 +74,6 @@ flags.DEFINE_bool('use_syslog', False, 'output to syslog')
flags.DEFINE_string('logfile', None, 'output to named file')
# A list of things we want to replicate from logging.
# levels
CRITICAL = logging.CRITICAL
@@ -112,7 +111,7 @@ def _dictify_context(context):
return None
if not isinstance(context, dict) \
and getattr(context, 'to_dict', None):
context = context.to_dict()
context = context.to_dict()
return context

View File

@@ -35,15 +35,16 @@ class RootLoggerTestCase(test.TrialTestCase):
def test_handles_context_kwarg(self):
self.log.info("foo", context=_fake_context())
self.assert_(True) # didn't raise exception
self.assert_(True) # didn't raise exception
def test_module_level_methods_handle_context_arg(self):
log.info("foo", context=_fake_context())
self.assert_(True) # didn't raise exception
self.assert_(True) # didn't raise exception
def test_module_level_audit_handles_context_arg(self):
log.audit("foo", context=_fake_context())
self.assert_(True) # didn't raise exception
self.assert_(True) # didn't raise exception
class NovaFormatterTestCase(test.TrialTestCase):
def setUp(self):
@@ -76,6 +77,7 @@ class NovaFormatterTestCase(test.TrialTestCase):
self.log.debug("baz")
self.assertEqual("NOCTXT: baz --DBG\n", self.stream.getvalue())
class NovaLoggerTestCase(test.TrialTestCase):
def setUp(self):
super(NovaLoggerTestCase, self).setUp()
@@ -93,6 +95,7 @@ class NovaLoggerTestCase(test.TrialTestCase):
l = log.getLogger('nova-test.foo')
self.assertEqual(log.AUDIT, l.level)
class VerboseLoggerTestCase(test.TrialTestCase):
def setUp(self):
super(VerboseLoggerTestCase, self).setUp()