[CalendarServer-changes] [2443] CalendarServer/branches/unified-cache/twistedcaldav

[source_changes at macosforge.org]

Revision: 2443
          http://trac.macosforge.org/projects/calendarserver/changeset/2443
Author:   dreid at apple.com
Date:     2008-05-22 16:41:39 -0700 (Thu, 22 May 2008)

Log Message:
-----------
Fix some test failures.

Modified Paths:
--------------
    CalendarServer/branches/unified-cache/twistedcaldav/cluster.py
    CalendarServer/branches/unified-cache/twistedcaldav/config.py
    CalendarServer/branches/unified-cache/twistedcaldav/test/test_memcache.py

Modified: CalendarServer/branches/unified-cache/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/branches/unified-cache/twistedcaldav/cluster.py	2008-05-22 23:13:51 UTC (rev 2442)
+++ CalendarServer/branches/unified-cache/twistedcaldav/cluster.py	2008-05-22 23:41:39 UTC (rev 2443)
@@ -300,7 +300,7 @@
                 '-p', str(config.Memcached["Port"]),
                 '-l', config.Memcached["BindAddress"]]
 
-        if config.Memcached["MaxMemory"] is not None:
+        if config.Memcached["MaxMemory"] is not 0:
             memcachedArgv.extend([
                     '-m', str(config.Memcached["MaxMemory"])])
 

Modified: CalendarServer/branches/unified-cache/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/unified-cache/twistedcaldav/config.py	2008-05-22 23:13:51 UTC (rev 2442)
+++ CalendarServer/branches/unified-cache/twistedcaldav/config.py	2008-05-22 23:41:39 UTC (rev 2443)
@@ -210,7 +210,7 @@
         "BindAddress": "127.0.0.1",
         "Port": 11211,
         "memcached": "/usr/share/caldavd/bin/memcached",
-        "MaxMemory": None, # Megabytes
+        "MaxMemory": 0, # Megabytes
         "Options": [],
     },
 }

Modified: CalendarServer/branches/unified-cache/twistedcaldav/test/test_memcache.py
===================================================================
--- CalendarServer/branches/unified-cache/twistedcaldav/test/test_memcache.py	2008-05-22 23:13:51 UTC (rev 2442)
+++ CalendarServer/branches/unified-cache/twistedcaldav/test/test_memcache.py	2008-05-22 23:41:39 UTC (rev 2443)
@@ -5,8 +5,8 @@
 Test the memcache client protocol.
 """
 
-from twisted.protocols.memcache import MemCacheProtocol, NoSuchCommand
-from twisted.protocols.memcache import ClientError, ServerError
+from twistedcaldav.memcache import MemCacheProtocol, NoSuchCommand
+from twistedcaldav.memcache import ClientError, ServerError
 
 from twisted.trial.unittest import TestCase
 from twisted.test.proto_helpers import StringTransportWithDisconnection

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080522/a7337b94/attachment.htm