[CalendarServer-changes] [3703] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 3703
          http://trac.macosforge.org/projects/calendarserver/changeset/3703
Author:   cdaboo at apple.com
Date:     2009-02-20 13:15:37 -0800 (Fri, 20 Feb 2009)
Log Message:
-----------
Fix to ensure OD and XML directory backed servers can both be tested with the same set of CalDAVTester scripts.

Modified Paths:
--------------
    CalendarServer/trunk/conf/auth/accounts-test.xml
    CalendarServer/trunk/run

Modified: CalendarServer/trunk/conf/auth/accounts-test.xml
===================================================================
--- CalendarServer/trunk/conf/auth/accounts-test.xml	2009-02-20 21:13:48 UTC (rev 3702)
+++ CalendarServer/trunk/conf/auth/accounts-test.xml	2009-02-20 21:15:37 UTC (rev 3703)
@@ -85,44 +85,44 @@
     </members>
   </group>
   <group>
-    <uid>disabledgroup</uid>
-    <guid>disabledgroup</guid>
-    <password>disabledgroup</password>
-    <name>Disabled Group</name>
+    <uid>group02</uid>
+    <guid>group02</guid>
+    <password>group02</password>
+    <name>Group 02</name>
     <members>
-      <member type="users">user01</member>
+      <member type="users">user06</member>
+      <member type="users">user07</member>
     </members>
-    <disable-calendar/>
   </group>
   <group>
-    <uid>subgroup1</uid>
-    <guid>subgroup1</guid>
-    <password>subgroup1</password>
-    <name>Sub Group 1</name>
+    <uid>group03</uid>
+    <guid>group03</guid>
+    <password>group03</password>
+    <name>Group 03</name>
     <members>
-      <member type="users">user10</member>
-      <member type="users">user11</member>
+      <member type="users">user08</member>
+      <member type="users">user09</member>
     </members>
   </group>
   <group>
-    <uid>subgroup2</uid>
-    <guid>subgroup2</guid>
-    <password>subgroup2</password>
-    <name>Sub Group 2</name>
+    <uid>group04</uid>
+    <guid>group04</guid>
+    <password>group04</password>
+    <name>Group 04</name>
     <members>
-      <member type="users">user12</member>
-      <member type="users">user13</member>
+      <member type="groups">group02</member>
+      <member type="groups">group03</member>
+      <member type="users">user10</member>
     </members>
   </group>
   <group>
-    <uid>toplevelgroup</uid>
-    <guid>toplevelgroup</guid>
-    <password>toplevelgroup</password>
-    <name>Top Level Group</name>
+    <uid>disabledgroup</uid>
+    <guid>disabledgroup</guid>
+    <password>disabledgroup</password>
+    <name>Disabled Group</name>
     <members>
-      <member type="groups">subgroup1</member>
-      <member type="groups">subgroup2</member>
-      <member type="users">user14</member>
+      <member type="users">user01</member>
     </members>
+    <disable-calendar/>
   </group>
 </accounts>

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2009-02-20 21:13:48 UTC (rev 3702)
+++ CalendarServer/trunk/run	2009-02-20 21:15:37 UTC (rev 3703)
@@ -707,7 +707,7 @@
 
 caldavtester="${top}/CalDAVTester";
 
-svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 3682;
+svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 3702;
 
 #
 # PyFlakes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090220/9190bec8/attachment.html>