[CalendarServer-changes] [14888] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Jun 8 08:00:13 PDT 2015


Revision: 14888
          http://trac.calendarserver.org//changeset/14888
Author:   sagen at apple.com
Date:     2015-06-08 08:00:13 -0700 (Mon, 08 Jun 2015)
Log Message:
-----------
Fix the wiki endpoint descriptor

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/stdconfig.py
    CalendarServer/trunk/txdav/common/datastore/test/util.py
    CalendarServer/trunk/txdav/who/test/test_util.py
    CalendarServer/trunk/txdav/who/test/test_wiki.py

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2015-06-07 15:19:53 UTC (rev 14887)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2015-06-08 15:00:13 UTC (rev 14888)
@@ -392,7 +392,7 @@
         "Wiki": {
             "Enabled": False,
             "Cookie": "cc.collabd_session_guid",
-            "EndpointDescriptor": "http://localhost:4444/"
+            "EndpointDescriptor": "tcp:host=localhost:port=4444"
         },
     },
 

Modified: CalendarServer/trunk/txdav/common/datastore/test/util.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/test/util.py	2015-06-07 15:19:53 UTC (rev 14887)
+++ CalendarServer/trunk/txdav/common/datastore/test/util.py	2015-06-08 15:00:13 UTC (rev 14888)
@@ -791,7 +791,7 @@
     wikiServiceInfo = ConfigDict(
         {
             "Enabled": True,
-            "EndpointDescriptor": "http://localhost:4444/",
+            "EndpointDescriptor": "tcp:host=localhost:port=4444",
         }
     )
     directory = buildDirectory(

Modified: CalendarServer/trunk/txdav/who/test/test_util.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_util.py	2015-06-07 15:19:53 UTC (rev 14887)
+++ CalendarServer/trunk/txdav/who/test/test_util.py	2015-06-08 15:00:13 UTC (rev 14888)
@@ -79,7 +79,7 @@
                 "Authentication": {
                     "Wiki": {
                         "Enabled": True,
-                        "EndpointDescriptor": "http://localhost:4444/",
+                        "EndpointDescriptor": "tcp:host=localhost:port=4444",
                     },
                 },
                 "DirectoryService": {

Modified: CalendarServer/trunk/txdav/who/test/test_wiki.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_wiki.py	2015-06-07 15:19:53 UTC (rev 14887)
+++ CalendarServer/trunk/txdav/who/test/test_wiki.py	2015-06-08 15:00:13 UTC (rev 14888)
@@ -39,7 +39,7 @@
 
     @inlineCallbacks
     def test_service(self):
-        service = DirectoryService("realm", "http://localhost:4444/")
+        service = DirectoryService("realm", "tcp:host=localhost:port=4444")
         record = yield service.recordWithUID(u"wiki-test")
         self.assertEquals(
             record.shortNames[0],
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150608/121f9dca/attachment.html>


More information about the calendarserver-changes mailing list