[CalendarServer-changes] [14738] CalendarServer/trunk/calendarserver/tools/test/test_gateway.py

[source_changes at macosforge.org]

Revision: 14738
          http://trac.calendarserver.org//changeset/14738
Author:   cdaboo at apple.com
Date:     2015-05-04 07:40:33 -0700 (Mon, 04 May 2015)
Log Message:
-----------
Fix test for read-only config change.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/test/test_gateway.py

Modified: CalendarServer/trunk/calendarserver/tools/test/test_gateway.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_gateway.py	2015-05-04 14:24:28 UTC (rev 14737)
+++ CalendarServer/trunk/calendarserver/tools/test/test_gateway.py	2015-05-04 14:40:33 UTC (rev 14738)
@@ -43,25 +43,25 @@
 
         self.serverRoot = self.mktemp()
         os.mkdir(self.serverRoot)
-        absoluteServerRoot = os.path.abspath(self.serverRoot)
+        self.absoluteServerRoot = os.path.abspath(self.serverRoot)
 
-        configRoot = os.path.join(absoluteServerRoot, "Config")
+        configRoot = os.path.join(self.absoluteServerRoot, "Config")
         if not os.path.exists(configRoot):
             os.makedirs(configRoot)
 
-        dataRoot = os.path.join(absoluteServerRoot, "Data")
+        dataRoot = os.path.join(self.absoluteServerRoot, "Data")
         if not os.path.exists(dataRoot):
             os.makedirs(dataRoot)
 
-        documentRoot = os.path.join(absoluteServerRoot, "Documents")
+        documentRoot = os.path.join(self.absoluteServerRoot, "Documents")
         if not os.path.exists(documentRoot):
             os.makedirs(documentRoot)
 
-        logRoot = os.path.join(absoluteServerRoot, "Logs")
+        logRoot = os.path.join(self.absoluteServerRoot, "Logs")
         if not os.path.exists(logRoot):
             os.makedirs(logRoot)
 
-        runRoot = os.path.join(absoluteServerRoot, "Run")
+        runRoot = os.path.join(self.absoluteServerRoot, "Run")
         if not os.path.exists(runRoot):
             os.makedirs(runRoot)
 
@@ -75,7 +75,7 @@
 
         databaseRoot = os.path.abspath("_spawned_scripts_db" + str(os.getpid()))
         newConfig = template % {
-            "ServerRoot": absoluteServerRoot,
+            "ServerRoot": self.absoluteServerRoot,
             "DataRoot": dataRoot,
             "DatabaseRoot": databaseRoot,
             "DocumentRoot": documentRoot,
@@ -468,10 +468,13 @@
         self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["Enabled"], False)
         self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["CalDAV"]["CertificatePath"], "/example/calendar.cer")
 
-        # Verify not all keys are present, such as ServerRoot which is not writable
-        self.assertFalse("ServerRoot" in results["result"])
+        # This is a read only key that is returned
+        self.assertEquals(results["result"]["ServerRoot"], self.absoluteServerRoot)
 
+        # Verify other non-writeable keys are not present, such as DataRoot which is not writable
+        self.assertFalse("DataRoot" in results["result"])
 
+
     @inlineCallbacks
     def test_writeConfig(self):
         """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150504/461156e9/attachment.html>