[CalendarServer-changes] [1731] CalendarServer/branches/users/wsanchez/deleted-uids

[source_changes at macosforge.org]

Revision: 1731
          http://trac.macosforge.org/projects/calendarserver/changeset/1731
Author:   cdaboo at apple.com
Date:     2007-07-30 14:10:00 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
Make sure the XML accounts setup for testing uses simple guids that we can hard-code tests against.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deleted-uids/conf/accounts-test.xml
    CalendarServer/branches/users/wsanchez/deleted-uids/conf/caldavd-test.plist
    CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/directory/xmlaccountsparser.py

Modified: CalendarServer/branches/users/wsanchez/deleted-uids/conf/accounts-test.xml
===================================================================
--- CalendarServer/branches/users/wsanchez/deleted-uids/conf/accounts-test.xml	2007-07-30 18:04:32 UTC (rev 1730)
+++ CalendarServer/branches/users/wsanchez/deleted-uids/conf/accounts-test.xml	2007-07-30 21:10:00 UTC (rev 1731)
@@ -21,29 +21,34 @@
 <accounts realm="Test Realm">
   <user>
     <uid>admin</uid>
+    <guid>admin</guid>
     <password>admin</password>
     <name>Super User</name>
   </user>
   <user repeat="99">
     <uid>user%02d</uid>
+    <guid>user%02d</guid>
     <password>user%02d</password>
     <name>User %02d</name>
     <cuaddr>mailto:user%02d at example.com</cuaddr>
   </user>
   <user repeat="10">
     <uid>public%02d</uid>
+    <guid>public%02d</guid>
     <password>public%02d</password>
     <name>Public %02d</name>
     <cuaddr>mailto:public%02d at example.com</cuaddr>
   </user>
   <location repeat="10">
     <uid>location%02d</uid>
+    <guid>location%02d</guid>
     <password>location%02d</password>
     <name>Room %02d</name>
     <auto-schedule/>
   </location>
   <resource repeat="10">
     <uid>resource%02d</uid>
+    <guid>resource%02d</guid>
     <password>resource%02d</password>
     <name>Resource %02d</name>
     <auto-schedule/>
@@ -53,6 +58,7 @@
   </resource>
   <group>
     <uid>group01</uid>
+    <guid>group01</guid>
     <password>group01</password>
     <name>Group 01</name>
     <members>

Modified: CalendarServer/branches/users/wsanchez/deleted-uids/conf/caldavd-test.plist
===================================================================
--- CalendarServer/branches/users/wsanchez/deleted-uids/conf/caldavd-test.plist	2007-07-30 18:04:32 UTC (rev 1730)
+++ CalendarServer/branches/users/wsanchez/deleted-uids/conf/caldavd-test.plist	2007-07-30 21:10:00 UTC (rev 1731)
@@ -186,7 +186,7 @@
   <!-- Principals with "DAV:all" access (relative URLs) -->
   <key>AdminPrincipals</key>
   <array>
-    <string>/principals/users/admin/</string>
+    <string>/principals/__uids__/admin/</string>
   </array>
 
   <!-- Principals that can pose as other principals -->

Modified: CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/directory/xmlaccountsparser.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/directory/xmlaccountsparser.py	2007-07-30 18:04:32 UTC (rev 1730)
+++ CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/directory/xmlaccountsparser.py	2007-07-30 21:10:00 UTC (rev 1731)
@@ -168,6 +168,10 @@
             shortName = self.shortName % ctr
         else:
             shortName = self.shortName
+        if self.guid.find("%") != -1:
+            guid = self.guid % ctr
+        else:
+            guid = self.guid
         if self.password.find("%") != -1:
             password = self.password % ctr
         else:
@@ -185,6 +189,7 @@
         
         result = XMLAccountRecord(self.recordType)
         result.shortName = shortName
+        result.guid = guid
         result.password = password
         result.name = name
         result.members = self.members

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070730/7df4db26/attachment.html