[CalendarServer-changes] [9406] CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/ migration

[source_changes at macosforge.org]

Revision: 9406
          http://trac.macosforge.org/projects/calendarserver/changeset/9406
Author:   sagen at apple.com
Date:     2012-07-03 18:18:04 -0700 (Tue, 03 Jul 2012)
Log Message:
-----------
Pulling in rev 9405 from trunk -- Migration extra shouldn't be setting EnableAPNS

Revision Links:
--------------
    http://trac.macosforge.org/projects/calendarserver/changeset/9405

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/migration/calendarmigrator.py
    CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/migration/test/test_migrator.py

Modified: CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/migration/calendarmigrator.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/migration/calendarmigrator.py	2012-07-04 00:59:46 UTC (rev 9405)
+++ CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/migration/calendarmigrator.py	2012-07-04 01:18:04 UTC (rev 9406)
@@ -419,7 +419,6 @@
     try:
         if caldav["Notifications"]["Services"]["XMPPNotifier"]["Enabled"]:
             caldav["Notifications"]["Services"]["XMPPNotifier"]["Enabled"] = False
-        adminChanges.append(("EnableAPNS", "True"))
     except KeyError:
         pass
 

Modified: CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/migration/test/test_migrator.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/migration/test/test_migrator.py	2012-07-04 00:59:46 UTC (rev 9405)
+++ CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/migration/test/test_migrator.py	2012-07-04 01:18:04 UTC (rev 9406)
@@ -452,7 +452,7 @@
         }
         newCombined = { }
         adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
-        self.assertEquals(adminChanges, [("EnableAPNS", "True")])
+        self.assertEquals(adminChanges, [])
         self.assertEquals(newCombined, expected)
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120703/83af95e7/attachment-0001.html>