[CalendarServer-changes] [3733] CalendarServer/branches/users/sagen/migration-3709/twistedcaldav

[source_changes at macosforge.org]

Revision: 3733
          http://trac.macosforge.org/projects/calendarserver/changeset/3733
Author:   sagen at apple.com
Date:     2009-02-24 16:37:35 -0800 (Tue, 24 Feb 2009)
Log Message:
-----------
Verify other record types besides users get upgraded

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/migration-3709/twistedcaldav/directory/test/accounts.xml
    CalendarServer/branches/users/sagen/migration-3709/twistedcaldav/test/test_upgrade.py

Modified: CalendarServer/branches/users/sagen/migration-3709/twistedcaldav/directory/test/accounts.xml
===================================================================
--- CalendarServer/branches/users/sagen/migration-3709/twistedcaldav/directory/test/accounts.xml	2009-02-25 00:28:10 UTC (rev 3732)
+++ CalendarServer/branches/users/sagen/migration-3709/twistedcaldav/directory/test/accounts.xml	2009-02-25 00:37:35 UTC (rev 3733)
@@ -60,6 +60,7 @@
   </user>
   <group>
     <uid>managers</uid>
+    <guid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</guid>
     <password>managers</password>
     <name>Managers</name>
     <members>

Modified: CalendarServer/branches/users/sagen/migration-3709/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/branches/users/sagen/migration-3709/twistedcaldav/test/test_upgrade.py	2009-02-25 00:28:10 UTC (rev 3732)
+++ CalendarServer/branches/users/sagen/migration-3709/twistedcaldav/test/test_upgrade.py	2009-02-25 00:37:35 UTC (rev 3733)
@@ -265,9 +265,9 @@
         self.assertRaises(UpgradeError, updateFreeBusySet, value, directory)
 
 
-    def test_calendarsUpgradeWithUsers(self):
+    def test_calendarsUpgradeWithTypes(self):
         """
-        Verify that calendar homes in the /calendars/users/<shortname>/ form
+        Verify that calendar homes in the /calendars/<type>/<shortname>/ form
         are upgraded to /calendars/__uids__/XX/YY/<guid> form
         """
 
@@ -305,6 +305,15 @@
                         },
                     },
                 },
+                "groups" :
+                {
+                    "managers" :
+                    {
+                        "calendar" :
+                        {
+                        },
+                    },
+                },
             },
             "principals" :
             {
@@ -355,6 +364,18 @@
                             },
                         },
                     },
+                    "9F" :
+                    {
+                        "F6" :
+                        {
+                            "9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1" :
+                            {
+                                "calendar" :
+                                {
+                                },
+                            },
+                        },
+                    },
                 },
             },
             CalendarUserProxyDatabase.dbFilename :
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090224/cf71cad4/attachment.html>