[CalendarServer-changes] [3490] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 3490
          http://trac.macosforge.org/projects/calendarserver/changeset/3490
Author:   cdaboo at apple.com
Date:     2008-12-09 11:39:01 -0800 (Tue, 09 Dec 2008)
Log Message:
-----------
Tests were using an incorrect config variable. Also memcacher with memory caching was wrong as uncovered
by fixed test.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipaldb.py
    CalendarServer/trunk/twistedcaldav/memcacher.py
    CalendarServer/trunk/twistedcaldav/test/test_memcacher.py

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipaldb.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipaldb.py	2008-12-09 19:05:10 UTC (rev 3489)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipaldb.py	2008-12-09 19:39:01 UTC (rev 3490)
@@ -190,7 +190,7 @@
     def test_cachingDBInsert(self):
     
         for processType in ("Single", "Combined",):
-            config.processType = processType
+            config.ProcessType = processType
 
             # Get the DB
             db_path = self.mktemp()
@@ -231,7 +231,7 @@
     def test_cachingDBRemove(self):
     
         for processType in ("Single", "Combined",):
-            config.processType = processType
+            config.ProcessType = processType
 
             # Get the DB
             db_path = self.mktemp()
@@ -273,7 +273,7 @@
     def test_cachingDBInsertUncached(self):
     
         for processType in ("Single", "Combined",):
-            config.processType = processType
+            config.ProcessType = processType
 
             # Get the DB
             db_path = self.mktemp()

Modified: CalendarServer/trunk/twistedcaldav/memcacher.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/memcacher.py	2008-12-09 19:05:10 UTC (rev 3489)
+++ CalendarServer/trunk/twistedcaldav/memcacher.py	2008-12-09 19:39:01 UTC (rev 3490)
@@ -119,20 +119,24 @@
 
 
     def add(self, key, value, expire_time=0):
+        
+        proto = self._getMemcacheProtocol()
+
         my_value = value
         if self._pickle:
             my_value = cPickle.dumps(value)
         self.log_debug("Adding Cache Token for %r" % (key,))
-        return self._getMemcacheProtocol().add(
-            '%s:%s' % (self._namespace, key), my_value, expireTime=expire_time)
+        return proto.add('%s:%s' % (self._namespace, key), my_value, expireTime=expire_time)
 
     def set(self, key, value, expire_time=0):
+        
+        proto = self._getMemcacheProtocol()
+
         my_value = value
         if self._pickle:
             my_value = cPickle.dumps(value)
         self.log_debug("Setting Cache Token for %r" % (key,))
-        return self._getMemcacheProtocol().set(
-            '%s:%s' % (self._namespace, key), my_value, expireTime=expire_time)
+        return proto.set('%s:%s' % (self._namespace, key), my_value, expireTime=expire_time)
 
     def get(self, key):
         def _gotit(result):
@@ -149,5 +153,4 @@
 
     def delete(self, key):
         self.log_debug("Deleting Cache Token for %r" % (key,))
-        return self._getMemcacheProtocol().delete(
-            '%s:%s' % (self._namespace, key))
+        return self._getMemcacheProtocol().delete('%s:%s' % (self._namespace, key))

Modified: CalendarServer/trunk/twistedcaldav/test/test_memcacher.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_memcacher.py	2008-12-09 19:05:10 UTC (rev 3489)
+++ CalendarServer/trunk/twistedcaldav/test/test_memcacher.py	2008-12-09 19:39:01 UTC (rev 3490)
@@ -20,7 +20,7 @@
     def test_setget(self):
 
         for processType in ("Single", "Combined",):
-            config.processType = processType
+            config.ProcessType = processType
 
             cacher = Memcacher("testing")
     
@@ -37,7 +37,7 @@
     def test_missingget(self):
 
         for processType in ("Single", "Combined",):
-            config.processType = processType
+            config.ProcessType = processType
 
             cacher = Memcacher("testing")
     
@@ -48,7 +48,7 @@
     def test_delete(self):
 
         for processType in ("Single", "Combined",):
-            config.processType = processType
+            config.ProcessType = processType
 
             cacher = Memcacher("testing")
     
@@ -71,7 +71,7 @@
     def test_all_pickled(self):
 
         for processType in ("Single", "Combined",):
-            config.processType = processType
+            config.ProcessType = processType
 
             cacher = Memcacher("testing", pickle=True)
     
@@ -94,7 +94,7 @@
     def test_all_noinvalidation(self):
 
         for processType in ("Single", "Combined",):
-            config.processType = processType
+            config.ProcessType = processType
 
             cacher = Memcacher("testing", no_invalidation=True)
     
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081209/7d5d5107/attachment.html>