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

source_changes at macosforge.org source_changes at macosforge.org
Fri Jun 5 10:14:58 PDT 2015


Revision: 14884
          http://trac.calendarserver.org//changeset/14884
Author:   sagen at apple.com
Date:     2015-06-05 10:14:58 -0700 (Fri, 05 Jun 2015)
Log Message:
-----------
Add a removeObserver during teardown

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

Modified: CalendarServer/trunk/txweb2/test/test_log.py
===================================================================
--- CalendarServer/trunk/txweb2/test/test_log.py	2015-06-04 22:34:53 UTC (rev 14883)
+++ CalendarServer/trunk/txweb2/test/test_log.py	2015-06-05 17:14:58 UTC (rev 14884)
@@ -1,7 +1,7 @@
 # Copyright (c) 2001-2007 Twisted Matrix Laboratories.
 # See LICENSE for details.
 
-from twisted.python.log import addObserver, theLogPublisher
+from twisted.python.log import addObserver, removeObserver
 
 from txweb2.log import BaseCommonAccessLoggingObserver, LogWrapperResource
 from txweb2.http import Response
@@ -43,7 +43,6 @@
 
 class TestLogging(BaseCase):
     def setUp(self):
-        self.patch(theLogPublisher, "observers", [])
         self.blo = BufferingLogObserver()
         addObserver(self.blo.emit)
 
@@ -53,6 +52,8 @@
 
         self.root = SetDateWrapperResource(LogWrapperResource(self.resrc))
 
+    def tearDown(self):
+        removeObserver(self.blo.emit)
 
     def assertLogged(self, **expected):
         """
@@ -98,7 +99,6 @@
         """
         uri = 'http://localhost/'
         method = 'GET'
-
         def _cbCheckLog(response):
             self.assertLogged(method=method, uri=uri, status=response[0],
                               length=response[1].getHeader('content-length'))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150605/7d72781c/attachment.html>


More information about the calendarserver-changes mailing list