[CalendarServer-changes] [14650] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14650
          http://trac.calendarserver.org//changeset/14650
Author:   cdaboo at apple.com
Date:     2015-04-02 13:28:05 -0700 (Thu, 02 Apr 2015)
Log Message:
-----------
Tweaks to memcache socket change tests.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
    CalendarServer/trunk/twistedcaldav/memcacheclient.py
    CalendarServer/trunk/twistedcaldav/memcachepool.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2015-04-02 18:47:45 UTC (rev 14649)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2015-04-02 20:28:05 UTC (rev 14650)
@@ -1214,6 +1214,7 @@
                 config.BindAddresses = [""]
         return config.BindAddresses
 
+
     def _spawnMemcached(self, monitor=None):
         """
         Optionally start memcached through the specified ProcessMonitor,
@@ -1226,7 +1227,7 @@
                     "-U", "0",
                 ]
                 # Use Unix domain sockets by default
-                if "MemcacheSocket" in pool:
+                if pool.get("MemcacheSocket"):
                     memcachedArgv.extend([
                         "-s", str(pool.MemcacheSocket),
                     ])

Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2015-04-02 18:47:45 UTC (rev 14649)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2015-04-02 20:28:05 UTC (rev 14650)
@@ -69,6 +69,7 @@
 )
 from calendarserver.provision.root import RootResource
 from StringIO import StringIO
+import tempfile
 
 log = Logger()
 
@@ -442,13 +443,14 @@
             self.assertEquals(socketService.gid, self.alternateGroup)
 
 
+
 class MemcacheSpawner(TestCase):
 
     def setUp(self):
         super(MemcacheSpawner, self).setUp()
         self.monitor = ProcessMonitor()
         self.monitor.startService()
-        self.socket = os.path.abspath("memcache.sock")
+        self.socket = os.path.join(tempfile.gettempdir(), "memcache.sock")
         self.patch(config.Memcached.Pools.Default, "ServerEnabled", True)
 
 
@@ -495,6 +497,7 @@
         return self.monitor.stopService()
 
 
+
 class ProcessMonitorTests(CalDAVServiceMakerTestBase):
 
     def configure(self):

Modified: CalendarServer/trunk/twistedcaldav/memcacheclient.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/memcacheclient.py	2015-04-02 18:47:45 UTC (rev 14649)
+++ CalendarServer/trunk/twistedcaldav/memcacheclient.py	2015-04-02 20:28:05 UTC (rev 14650)
@@ -1301,7 +1301,7 @@
             if isinstance(msg, tuple):
                 msg = msg[1]
             log.error("Memcacheclient _get_socket() connection error (%s)" % (msg,))
-            self.mark_dead("connect: %s" % msg[1])
+            self.mark_dead("connect: %s" % msg)
             return None
         self.socket = s
         self.buffer = ''

Modified: CalendarServer/trunk/twistedcaldav/memcachepool.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/memcachepool.py	2015-04-02 18:47:45 UTC (rev 14649)
+++ CalendarServer/trunk/twistedcaldav/memcachepool.py	2015-04-02 20:28:05 UTC (rev 14650)
@@ -447,7 +447,7 @@
         from twisted.internet import reactor
     for name, pool in pools.items():
         if pool["ClientEnabled"]:
-            if "MemcacheSocket" in pool:
+            if pool.get("MemcacheSocket"):
                 ep = UNIXClientEndpoint(reactor, pool["MemcacheSocket"])
             else:
                 ep = GAIEndpoint(reactor, pool["BindAddress"], pool["Port"])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150402/78d7aeb7/attachment.html>