[CalendarServer-changes] [10036] CalendarServer/trunk/contrib/migration

[source_changes at macosforge.org]

Revision: 10036
          http://trac.calendarserver.org//changeset/10036
Author:   sagen at apple.com
Date:     2012-11-15 13:13:00 -0800 (Thu, 15 Nov 2012)
Log Message:
-----------
Don't turn on Basic by default

Modified Paths:
--------------
    CalendarServer/trunk/contrib/migration/calendarcommonextra.py
    CalendarServer/trunk/contrib/migration/test/test_commonextra.py

Modified: CalendarServer/trunk/contrib/migration/calendarcommonextra.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarcommonextra.py	2012-11-15 20:22:51 UTC (rev 10035)
+++ CalendarServer/trunk/contrib/migration/calendarcommonextra.py	2012-11-15 21:13:00 UTC (rev 10036)
@@ -146,7 +146,6 @@
 
     settings["EnableSSL"] = True
     settings["RedirectHTTPToHTTPS"] = True
-    settings.setdefault("Authentication", {}).setdefault("Basic", {})["Enabled"] = True
 
 def setCert(plistPath, otherCert):
     """

Modified: CalendarServer/trunk/contrib/migration/test/test_commonextra.py
===================================================================
--- CalendarServer/trunk/contrib/migration/test/test_commonextra.py	2012-11-15 20:22:51 UTC (rev 10035)
+++ CalendarServer/trunk/contrib/migration/test/test_commonextra.py	2012-11-15 21:13:00 UTC (rev 10036)
@@ -34,7 +34,6 @@
         orig = {
         }
         expected = {
-            'Authentication': {'Basic': {'Enabled': True}},
             'EnableSSL': True,
             'RedirectHTTPToHTTPS': True,
             'SSLAuthorityChain': '/test/pchain.pem',
@@ -43,17 +42,3 @@
         }
         updateSettings(orig, "/test/path.cert")
         self.assertEquals(orig, expected)
-
-        orig = {
-            'Authentication': {'Basic': {'Enabled': False}},
-        }
-        expected = {
-            'Authentication': {'Basic': {'Enabled': True}},
-            'EnableSSL': True,
-            'RedirectHTTPToHTTPS': True,
-            'SSLAuthorityChain': '/test/pchain.pem',
-            'SSLCertificate': '/test/path.cert',
-            'SSLPrivateKey': '/test/pkey.pem',
-        }
-        updateSettings(orig, "/test/path.cert")
-        self.assertEquals(orig, expected)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121115/3d60d29d/attachment-0001.html>