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

[source_changes at macosforge.org]

Revision: 14436
          http://trac.calendarserver.org//changeset/14436
Author:   sagen at apple.com
Date:     2015-02-18 16:38:19 -0800 (Wed, 18 Feb 2015)
Log Message:
-----------
Fix pod tests

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
    CalDAVTester/trunk/scripts/server/serverinfo-template.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-notification-sync.xml

Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml	2015-02-18 23:35:31 UTC (rev 14435)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml	2015-02-19 00:38:19 UTC (rev 14436)
@@ -306,15 +306,21 @@
 		<!-- Sync home collection items - use "-" to include the home resource-->
 		<substitution>
 			<key>$calendar_home_items_initial_sync:</key>
-			<value>[$calendar:/,$tasks:/,$inbox:/,$outbox:/,$freebusy:,$notification:/]</value>
+			<value>[-,$calendar:/,$tasks:/,$inbox:/,$outbox:/,$freebusy:,$notification:/]</value>
 		</substitution>
 
 		<!-- Sync collection extra items - use "-" to include the collection-->
 		<substitution>
 			<key>$calendar_sync_extra_items:</key>
-			<value>[]</value>
+			<value>[-]</value>
 		</substitution>
 
+		<!-- Sync collection extra count - gets added to the totalcount value-->
+		<substitution>
+			<key>$calendar_sync_extra_count:</key>
+			<value>1</value> <!-- the request-uri resource is returned when no token passed-->
+		</substitution>
+
 		<!-- server-to-server inbox-->
 		<substitution>
 			<key>$servertoserver:</key>

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2015-02-18 23:35:31 UTC (rev 14435)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2015-02-19 00:38:19 UTC (rev 14436)
@@ -304,15 +304,22 @@
 		<!-- Sync home collection items - use "-" to include the home resource-->
 		<substitution>
 			<key>$calendar_home_items_initial_sync:</key>
-			<value>[$calendar:/,$tasks:/,$inbox:/,$outbox:/,$freebusy:,$notification:/]</value>
+			<value>[-,$calendar:/,$tasks:/,$inbox:/,$outbox:/,$freebusy:,$notification:/]</value>
 		</substitution>
 
 		<!-- Sync collection extra items - use "-" to include the collection-->
 		<substitution>
 			<key>$calendar_sync_extra_items:</key>
-			<value>[]</value>
+			<value>[-]</value>
 		</substitution>
 
+		<!-- Sync collection extra count - gets added to the totalcount value-->
+		<substitution>
+			<key>$calendar_sync_extra_count:</key>
+			<value>1</value> <!-- the request-uri resource is returned when no token passed-->
+		</substitution>
+
+
 		<!-- server-to-server inbox-->
 		<substitution>
 			<key>$servertoserver:</key>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-notification-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-notification-sync.xml	2015-02-18 23:35:31 UTC (rev 14435)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-notification-sync.xml	2015-02-19 00:38:19 UTC (rev 14436)
@@ -52,7 +52,7 @@
 			</data>
 		</request>
 	</start>
-	
+
 	<test-suite name='initial tokens - depth 1'>
 		<test name='1'>
 			<description>initial query - grab token</description>
@@ -72,6 +72,7 @@
 					<arg>
 						<name>totalcount</name>
 						<value>0</value>
+						<value>$calendar_sync_extra_count:</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -98,6 +99,7 @@
 					<arg>
 						<name>totalcount</name>
 						<value>0</value>
+						<value>$calendar_sync_extra_count:</value>
 					</arg>
 				</verify>
 				<grabelement>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150218/c67c5a0d/attachment.html>