[CalendarServer-changes] [12676] CalendarServer/trunk/txweb2/test/test_log.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:16:27 PDT 2014


Revision: 12676
          http://trac.calendarserver.org//changeset/12676
Author:   cdaboo at apple.com
Date:     2014-02-12 11:01:04 -0800 (Wed, 12 Feb 2014)
Log Message:
-----------
Clear out any existing observers before running the log tests.

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

Modified: CalendarServer/trunk/txweb2/test/test_log.py
===================================================================
--- CalendarServer/trunk/txweb2/test/test_log.py	2014-02-12 18:39:41 UTC (rev 12675)
+++ CalendarServer/trunk/txweb2/test/test_log.py	2014-02-12 19:01:04 UTC (rev 12676)
@@ -1,7 +1,7 @@
 # Copyright (c) 2001-2007 Twisted Matrix Laboratories.
 # See LICENSE for details.
 
-from twisted.python.log import addObserver, removeObserver
+from twisted.python.log import addObserver, removeObserver, theLogPublisher
 
 from txweb2.log import BaseCommonAccessLoggingObserver, LogWrapperResource
 from txweb2.http import Response
@@ -37,6 +37,7 @@
 
 class TestLogging(BaseCase):
     def setUp(self):
+        self.patch(theLogPublisher, "observers", [])
         self.blo = BufferingLogObserver()
         addObserver(self.blo.emit)
 
@@ -46,9 +47,6 @@
 
         self.root = SetDateWrapperResource(LogWrapperResource(self.resrc))
 
-    def tearDown(self):
-        removeObserver(self.blo.emit)
-
     def assertLogged(self, **expected):
         """
         Check that logged messages matches expected format.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/5bec28bd/attachment.html>


More information about the calendarserver-changes mailing list