[CalendarServer-changes] [13130] CalendarServer/branches/users/sagen/move2who-cdt/scripts

source_changes at macosforge.org source_changes at macosforge.org
Wed Apr 2 13:51:42 PDT 2014


Revision: 13130
          http://trac.calendarserver.org//changeset/13130
Author:   sagen at apple.com
Date:     2014-04-02 13:51:42 -0700 (Wed, 02 Apr 2014)
Log Message:
-----------
don't test for /addressbooks/groups/ and /calendars/groups/

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-pod.xml
    CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-template.xml
    CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo.xml
    CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CalDAV/directory.xml
    CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/directory.xml

Modified: CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-pod.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-pod.xml	2014-04-02 20:48:29 UTC (rev 13129)
+++ CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-pod.xml	2014-04-02 20:51:42 UTC (rev 13130)
@@ -28,7 +28,7 @@
 	<sslport2>8543</sslport2>
 
 	<authtype>basic</authtype>
-	
+
 	<waitcount>120</waitcount>
 	<waitdelay>0.25</waitdelay>
 
@@ -37,7 +37,7 @@
 		<feature>COPY Method</feature>							<!-- COPY method -->
 		<feature>MOVE Method</feature>							<!-- MOVE method -->
 		<feature>Extended MKCOL</feature>						<!-- Extended MKCOL -->
-		
+
 		<!-- ACL related -->
 		<feature>ACL Method</feature>							<!-- ACL method -->
 		<feature>acl-principal-prop-set REPORT</feature>		<!-- ACL acl-principal-prop-set REPORT -->
@@ -233,10 +233,6 @@
 			<value>$calendars:$userstype:/</value>
 		</substitution>
 		<substitution>
-			<key>$calendars_groups:</key>
-			<value>$calendars:$groupstype:/</value>
-		</substitution>
-		<substitution>
 			<key>$calendars_resources:</key>
 			<value>$calendars:$resourcestype:/</value>
 		</substitution>
@@ -326,10 +322,6 @@
 			<key>$addressbooks_users:</key>
 			<value>$addressbooks:$userstype:/</value>
 		</substitution>
-		<substitution>
-			<key>$addressbooks_groups:</key>
-			<value>$addressbooks:$groupstype:/</value>
-		</substitution>
 
 		<!-- primary addressbook name -->
 		<substitution>

Modified: CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-template.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-template.xml	2014-04-02 20:48:29 UTC (rev 13129)
+++ CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-template.xml	2014-04-02 20:51:42 UTC (rev 13130)
@@ -23,7 +23,7 @@
 	<nonsslport>%(nonsslport)s</nonsslport>
 	<sslport>%(sslport)s</sslport>
 	<authtype>%(authtype)s</authtype>
-	
+
 	<waitcount>120</waitcount>
 	<waitdelay>0.25</waitdelay>
 
@@ -32,7 +32,7 @@
 		<feature>COPY Method</feature>							<!-- COPY method -->
 		<feature>MOVE Method</feature>							<!-- MOVE method -->
 		<feature>Extended MKCOL</feature>						<!-- Extended MKCOL -->
-		
+
 		<!-- ACL related -->
 		<feature>ACL Method</feature>							<!-- ACL method -->
 		<feature>acl-principal-prop-set REPORT</feature>		<!-- ACL acl-principal-prop-set REPORT -->
@@ -228,10 +228,6 @@
 			<value>$calendars:$userstype:/</value>
 		</substitution>
 		<substitution>
-			<key>$calendars_groups:</key>
-			<value>$calendars:$groupstype:/</value>
-		</substitution>
-		<substitution>
 			<key>$calendars_resources:</key>
 			<value>$calendars:$resourcestype:/</value>
 		</substitution>
@@ -321,10 +317,6 @@
 			<key>$addressbooks_users:</key>
 			<value>$addressbooks:$userstype:/</value>
 		</substitution>
-		<substitution>
-			<key>$addressbooks_groups:</key>
-			<value>$addressbooks:$groupstype:/</value>
-		</substitution>
 
 		<!-- primary addressbook name -->
 		<substitution>

Modified: CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo.xml	2014-04-02 20:48:29 UTC (rev 13129)
+++ CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo.xml	2014-04-02 20:51:42 UTC (rev 13130)
@@ -228,10 +228,6 @@
 			<value>$calendars:$userstype:/</value>
 		</substitution>
 		<substitution>
-			<key>$calendars_groups:</key>
-			<value>$calendars:$groupstype:/</value>
-		</substitution>
-		<substitution>
 			<key>$calendars_resources:</key>
 			<value>$calendars:$resourcestype:/</value>
 		</substitution>
@@ -327,10 +323,6 @@
 			<key>$addressbooks_users:</key>
 			<value>$addressbooks:$userstype:/</value>
 		</substitution>
-		<substitution>
-			<key>$addressbooks_groups:</key>
-			<value>$addressbooks:$groupstype:/</value>
-		</substitution>
 
 		<!-- primary addressbook name -->
 		<substitution>

Modified: CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CalDAV/directory.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CalDAV/directory.xml	2014-04-02 20:48:29 UTC (rev 13129)
+++ CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CalDAV/directory.xml	2014-04-02 20:51:42 UTC (rev 13130)
@@ -27,7 +27,7 @@
 	</require-feature>
 
 	<start/>
-	
+
 	<test-suite name='GET on collections'>
 		<test name='1'>
 			<description>GET on root collection</description>
@@ -124,16 +124,6 @@
 			</request>
 		</test>
 		<test name='10'>
-			<description>GET on group calendars collection</description>
-			<request>
-				<method>GET</method>
-				<ruri>$calendars_groups:</ruri>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='11'>
 			<description>GET on locations calendars collection</description>
 			<request>
 				<method>GET</method>
@@ -143,7 +133,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12'>
+		<test name='11'>
 			<description>GET on resources calendars collection</description>
 			<request>
 				<method>GET</method>
@@ -153,7 +143,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13'>
+		<test name='12'>
 			<description>GET on __uids__ calendars collection</description>
 			<request>
 				<method>GET</method>
@@ -168,7 +158,7 @@
 			</request>
 		</test>
 	</test-suite>
-	
+
 	<end/>
-	
+
 </caldavtest>

Modified: CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/directory.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/directory.xml	2014-04-02 20:48:29 UTC (rev 13129)
+++ CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/directory.xml	2014-04-02 20:51:42 UTC (rev 13130)
@@ -20,7 +20,7 @@
 
 <caldavtest>
 	<description>Test GET on collections to ensure proper directory listing</description>
-	
+
 	<require-feature>
 		<feature>carddav</feature>
 	</require-feature>
@@ -67,7 +67,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-		</test>	
+		</test>
 		<test name='5'>
 			<description>GET on __uids__ principals collection</description>
 			<request>
@@ -103,16 +103,6 @@
 			</request>
 		</test>
 		<test name='8'>
-			<description>GET on group addressbooks collection</description>
-			<request>
-				<method>GET</method>
-				<ruri>$addressbooks_groups:</ruri>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='9'>
 			<description>GET on __uids__ addressbooks collection</description>
 			<request>
 				<method>GET</method>
@@ -129,5 +119,5 @@
 	</test-suite>
 
 	<end/>
-	
+
 </caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140402/49e824ef/attachment-0001.html>


More information about the calendarserver-changes mailing list