[CalendarServer-changes] [2338] CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/ test_log.py

[source_changes at macosforge.org]

Revision: 2338
          http://trac.macosforge.org/projects/calendarserver/changeset/2338
Author:   wsanchez at apple.com
Date:     2008-04-23 16:46:01 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
Simplify test.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py	2008-04-23 23:02:25 UTC (rev 2337)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py	2008-04-23 23:46:01 UTC (rev 2338)
@@ -19,15 +19,18 @@
 import twisted.trial.unittest
 
 class TestLogger (Logger):
-    def __init__(self, namespace=None, test_emit=None):
+    def __init__(self, namespace=None):
         super(TestLogger, self).__init__(namespace)
-        self._test_emit = test_emit
 
     def emit(self, level, message, **kwargs):
-        if self._test_emit is not None:
-            self._test_emit(level, message, **kwargs)
         super(TestLogger, self).emit(level, message, **kwargs)
 
+        self.emitted = {
+            "level"  : level,
+            "message": message,
+            "kwargs" : kwargs,
+        }
+
 class LoggingEnabledObject (LoggingMixIn):
     pass
 
@@ -56,20 +59,13 @@
         for level in logLevels:
             message = "This is a %s message" % (level,)
 
-            def test_emit(emit_level, emit_message, **kwargs):
-                emitted["level"  ] = emit_level
-                emitted["message"] = emit_message
-                emitted["junk"   ] = kwargs["junk"]
-
-            log = TestLogger(test_emit=test_emit)
+            log = TestLogger()
             object.logger = log
 
             for method in (getattr(log, level), getattr(object, "log_" + level)):
-                emitted = {}
-
                 method(message, junk=message)
 
                 # Ensure that test_emit got called with expected arguments
-                self.failUnless(emitted["level"  ] == level  )
-                self.failUnless(emitted["message"] == message)
-                self.failUnless(emitted["junk"   ] == message)
+                self.failUnless(log.emitted["level"] == level)
+                self.failUnless(log.emitted["message"] == message)
+                self.failUnless(log.emitted["kwargs"]["junk"] == message)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080423/9798273d/attachment.html