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

[source_changes at macosforge.org]

Revision: 9405
          http://trac.macosforge.org/projects/calendarserver/changeset/9405
Author:   sagen at apple.com
Date:     2012-07-03 17:59:46 -0700 (Tue, 03 Jul 2012)
Log Message:
-----------
Migration extra shouldn't be setting EnableAPNS

Modified Paths:
--------------
    CalendarServer/trunk/contrib/migration/calendarmigrator.py
    CalendarServer/trunk/contrib/migration/test/test_migrator.py

Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarmigrator.py	2012-07-03 14:24:42 UTC (rev 9404)
+++ CalendarServer/trunk/contrib/migration/calendarmigrator.py	2012-07-04 00:59:46 UTC (rev 9405)
@@ -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/trunk/contrib/migration/test/test_migrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/test/test_migrator.py	2012-07-03 14:24:42 UTC (rev 9404)
+++ CalendarServer/trunk/contrib/migration/test/test_migrator.py	2012-07-04 00:59:46 UTC (rev 9405)
@@ -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/171db1d8/attachment.html>