[CalendarServer-changes] [4333] CalendarServer/trunk/twistedcaldav/test/test_log.py

[source_changes at macosforge.org]

Revision: 4333
          http://trac.macosforge.org/projects/calendarserver/changeset/4333
Author:   wsanchez at apple.com
Date:     2009-06-05 10:12:09 -0700 (Fri, 05 Jun 2009)
Log Message:
-----------
Check logLevel kwarg and check the data in the actual observed events.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/test/test_log.py

Modified: CalendarServer/trunk/twistedcaldav/test/test_log.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_log.py	2009-06-05 17:02:36 UTC (rev 4332)
+++ CalendarServer/trunk/twistedcaldav/test/test_log.py	2009-06-05 17:12:09 UTC (rev 4333)
@@ -16,6 +16,8 @@
 
 import logging
 
+from twisted.python import log as twistedLogging
+
 from twistedcaldav.log import *
 from twistedcaldav.test.util import TestCase
 
@@ -26,8 +28,15 @@
         super(TestLogger, self).__init__(namespace)
 
     def emit(self, level, message, **kwargs):
+        def observer(eventDict):
+            self.eventDict = eventDict
+
+        twistedLogging.addObserver(observer)
+
         super(TestLogger, self).emit(level, message, **kwargs)
 
+        twistedLogging.removeObserver(observer)
+
         self.emitted = {
             "level"  : level,
             "message": message,
@@ -82,6 +91,15 @@
             self.assertEquals(log.emitted["message"], message)
             self.assertEquals(log.emitted["kwargs"]["junk"], message)
 
+            if log.willLogAtLevel(level):
+                self.assertEquals(log.eventDict["level"], level)
+                self.assertEquals(log.eventDict["logLevel"], pythonLogLevelForLevel(level))
+                # FIXME: this checks the end of message because we do formatting in emit()
+                self.assertEquals(log.eventDict["message"][0][-len(message):], message)
+                self.assertEquals(log.eventDict["junk"], message)
+            else:
+                self.assertFalse(hasattr(log, "eventDict"))
+
     def test_basic_LoggingMixIn(self):
         """
         Test that log levels and messages are emitted correctly for
@@ -101,6 +119,15 @@
             self.assertEquals(object.logger.emitted["message"], message)
             self.assertEquals(object.logger.emitted["kwargs"]["junk"], message)
 
+            if object.logger.willLogAtLevel(level):
+                self.assertEquals(object.logger.eventDict["level"], level)
+                self.assertEquals(object.logger.eventDict["logLevel"], pythonLogLevelForLevel(level))
+                # FIXME: this checks the end of message because we do formatting in emit()
+                self.assertEquals(object.logger.eventDict["message"][0][-len(message):], message)
+                self.assertEquals(object.logger.eventDict["junk"], message)
+            else:
+                self.assertFalse(hasattr(object.logger, "eventDict"))
+
     def test_defaultLogLevel(self):
         """
         Default log level is used.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090605/cabe472c/attachment.html>