[CalendarServer-changes] [7041] CalendarServer/trunk/twistedcaldav/test

[source_changes at macosforge.org]

Revision: 7041
          http://trac.macosforge.org/projects/calendarserver/changeset/7041
Author:   glyph at apple.com
Date:     2011-02-17 18:24:43 -0800 (Thu, 17 Feb 2011)
Log Message:
-----------
More places where memcache setup might be required.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py
    CalendarServer/trunk/twistedcaldav/test/test_sharing.py
    CalendarServer/trunk/twistedcaldav/test/test_wrapping.py

Modified: CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py	2011-02-18 00:40:17 UTC (rev 7040)
+++ CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py	2011-02-18 02:24:43 UTC (rev 7041)
@@ -34,6 +34,7 @@
 from twistedcaldav.config import config
 from twistedcaldav.test.util import HomeTestCase
 from twisted.internet.defer import inlineCallbacks, returnValue
+from twistedcaldav.memcacher import Memcacher
 from txdav.common.datastore.test.util import buildStore, StubNotifierFactory
 
 
@@ -354,6 +355,9 @@
 
     @inlineCallbacks
     def setUp(self):
+        self.patch(config.Memcached.Pools.Default, "ClientEnabled", False)
+        self.patch(config.Memcached.Pools.Default, "ServerEnabled", False)
+        self.patch(Memcacher, "allowTestCache", True)
         self.calendarStore = yield buildStore(self, StubNotifierFactory())
         yield super(DatabaseQueryTests, self).setUp()
 

Modified: CalendarServer/trunk/twistedcaldav/test/test_sharing.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_sharing.py	2011-02-18 00:40:17 UTC (rev 7040)
+++ CalendarServer/trunk/twistedcaldav/test/test_sharing.py	2011-02-18 02:24:43 UTC (rev 7041)
@@ -24,6 +24,7 @@
 from twistedcaldav import customxml
 from twistedcaldav.config import config
 from twistedcaldav.test.util import HomeTestCase, norequest
+from twistedcaldav.memcacher import Memcacher
 from twistedcaldav.resource import CalDAVResource
 from txdav.common.datastore.test.util import buildStore, StubNotifierFactory
 
@@ -546,6 +547,9 @@
 
     @inlineCallbacks
     def setUp(self):
+        self.patch(config.Memcached.Pools.Default, "ClientEnabled", False)
+        self.patch(config.Memcached.Pools.Default, "ServerEnabled", False)
+        self.patch(Memcacher, "allowTestCache", True)
         self.calendarStore = yield buildStore(self, StubNotifierFactory())
         yield super(DatabaseSharingTests, self).setUp()
 

Modified: CalendarServer/trunk/twistedcaldav/test/test_wrapping.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_wrapping.py	2011-02-18 00:40:17 UTC (rev 7040)
+++ CalendarServer/trunk/twistedcaldav/test/test_wrapping.py	2011-02-18 02:24:43 UTC (rev 7041)
@@ -46,6 +46,7 @@
     StubNotifierFactory
 
 
+from twistedcaldav.memcacher import Memcacher
 from txdav.caldav.icalendarstore import ICalendarHome
 from txdav.carddav.iaddressbookstore import IAddressBookHome
 
@@ -468,6 +469,9 @@
 
     @inlineCallbacks
     def setUp(self):
+        self.patch(config.Memcached.Pools.Default, "ClientEnabled", False)
+        self.patch(config.Memcached.Pools.Default, "ServerEnabled", False)
+        self.patch(Memcacher, "allowTestCache", True)
         self.calendarStore = yield buildStore(self, StubNotifierFactory())
         super(DatabaseWrappingTests, self).setUp()
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110217/f83fe18e/attachment-0001.html>