[CalendarServer-changes] [11752] CalDAVTester/trunk/scripts

[source_changes at macosforge.org]

Revision: 11752
          http://trac.calendarserver.org//changeset/11752
Author:   cdaboo at apple.com
Date:     2013-09-24 08:23:05 -0700 (Tue, 24 Sep 2013)
Log Message:
-----------
Add some conditional features for other servers.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
    CalDAVTester/trunk/scripts/server/serverinfo-template.xml
    CalDAVTester/trunk/scripts/server/serverinfo.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/current-user-principal.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml

Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2013-09-24 15:21:43 UTC (rev 11751)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2013-09-24 15:23:05 UTC (rev 11752)
@@ -38,6 +38,7 @@
 		<feature>principal-search-property-set REPORT</feature>	<!-- ACL principal-search-property-set REPORT -->
 
 		<feature>add-member</feature>					<!-- Add-member used to create resources -->
+		<!-- <feature>auth-on-root</feature> -->		<!-- Whether the server requires authentication on the root URI -->
 		<feature>brief</feature>					    <!-- Brief header for PROPFIND, REPORT -->
 		<feature>bulk-post</feature>					<!-- Bulk POST requests -->
 		<feature>ctag</feature>							<!-- ctag extension -->
@@ -65,6 +66,7 @@
 
 		<!-- CalDAV specific extension -->
 		<feature>caldav</feature>					    <!-- Basic CalDAV feature enabler -->
+		<feature>attachments-collection</feature>		<!-- Server uses a collection in same WebDAV tree to store attachments -->
 		<feature>auto-accept</feature>					<!-- Auto-accept for rooms & locations -->
 		<feature>auto-accept-modes</feature>			<!-- Auto-accept modes -->
 		<!-- <feature>dropbox</feature> -->				<!-- dropbox extension -->

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2013-09-24 15:21:43 UTC (rev 11751)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2013-09-24 15:23:05 UTC (rev 11752)
@@ -38,6 +38,7 @@
 		<feature>principal-search-property-set REPORT</feature>	<!-- ACL principal-search-property-set REPORT -->
 
 		<feature>add-member</feature>					<!-- Add-member used to create resources -->
+		<!-- <feature>auth-on-root</feature> -->		<!-- Whether the server requires authentication on the root URI -->
 		<feature>brief</feature>					    <!-- Brief header for PROPFIND, REPORT -->
 		<feature>bulk-post</feature>					<!-- Bulk POST requests -->
 		<feature>ctag</feature>							<!-- ctag extension -->
@@ -65,6 +66,7 @@
 
 		<!-- CalDAV specific extension -->
 		<feature>caldav</feature>					    <!-- Basic CalDAV feature enabler -->
+		<feature>attachments-collection</feature>		<!-- Server uses a collection in same WebDAV tree to store attachments -->
 		<feature>auto-accept</feature>					<!-- Auto-accept for rooms & locations -->
 		<feature>auto-accept-modes</feature>			<!-- Auto-accept modes -->
 		<!-- <feature>dropbox</feature> -->				<!-- dropbox extension -->

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2013-09-24 15:21:43 UTC (rev 11751)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2013-09-24 15:23:05 UTC (rev 11752)
@@ -38,6 +38,7 @@
 		<feature>principal-search-property-set REPORT</feature>	<!-- ACL principal-search-property-set REPORT -->
 
 		<feature>add-member</feature>					<!-- Add-member used to create resources -->
+		<!-- <feature>auth-on-root</feature> -->		<!-- Whether the server requires authentication on the root URI -->
 		<feature>brief</feature>					    <!-- Brief header for PROPFIND, REPORT -->
 		<feature>bulk-post</feature>					<!-- Bulk POST requests -->
 		<feature>ctag</feature>							<!-- ctag extension -->
@@ -65,6 +66,7 @@
 
 		<!-- CalDAV specific extension -->
 		<feature>caldav</feature>					    <!-- Basic CalDAV feature enabler -->
+		<feature>attachments-collection</feature>		<!-- Server uses a collection in same WebDAV tree to store attachments -->
 		<feature>auto-accept</feature>					<!-- Auto-accept for rooms & locations -->
 		<feature>auto-accept-modes</feature>			<!-- Auto-accept modes -->
 		<!--<feature>dropbox</feature> -->				<!-- dropbox extension -->

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/current-user-principal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/current-user-principal.xml	2013-09-24 15:21:43 UTC (rev 11751)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/current-user-principal.xml	2013-09-24 15:23:05 UTC (rev 11752)
@@ -65,12 +65,25 @@
 					<filepath>Resource/CalDAV/current-user-principal/1.xml</filepath>
 				</data>
 				<verify>
+					<exclude-feature>
+						<feature>auth-on-root</feature>
+					</exclude-feature>
 					<callback>propfindItems</callback>
 					<arg>
 						<name>okprops</name>
 						<value><![CDATA[{DAV:}current-user-principal$<unauthenticated xmlns="DAV:"/>]]></value>
 					</arg>
 				</verify>
+				<verify>
+					<require-feature>
+						<feature>auth-on-root</feature>
+					</require-feature>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>401</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='3' ignore='no'>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml	2013-09-24 15:21:43 UTC (rev 11751)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml	2013-09-24 15:23:05 UTC (rev 11752)
@@ -61,6 +61,9 @@
 	</test-suite>
 
 	<test-suite name="Privileges on Attachments Collection">
+		<require-feature>
+			<feature>attachments-collection</feature>
+		</require-feature>
 		<test name='1' ignore='no'>
 			<description>Check for schedule privilege on iTIP Inbox</description>
 			<request print-response='no'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130924/f507f637/attachment-0001.html>