[CalendarServer-changes] [14409] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Feb 13 09:35:52 PST 2015
Revision: 14409
http://trac.calendarserver.org//changeset/14409
Author: sagen at apple.com
Date: 2015-02-13 09:35:51 -0800 (Fri, 13 Feb 2015)
Log Message:
-----------
Now that config.EnableConfigSyncToken is on by default, request-uri resource will be returned in some sync reports
Modified Paths:
--------------
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml
CalDAVTester/trunk/verifiers/multistatusItems.py
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-02-12 22:10:41 UTC (rev 14408)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-02-13 17:35:51 UTC (rev 14409)
@@ -63,6 +63,7 @@
<feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
<!-- <feature>sync-report-limit</feature> --> <!-- WebDAV collection sync REPORT DAV:limit support -->
<feature>sync-report-home</feature> <!-- WebDAV collection sync REPORT on Homes -->
+ <feature>sync-report-config-token</feature> <!-- Sync REPORT token includes configuration component -->
<feature>well-known</feature> <!-- well-known feature -->
<!-- <feature>per-object-ACLs</feature> --> <!-- ACL for objects in calendar/address books -->
@@ -304,15 +305,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/tests/CalDAV/sharing-notification-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2015-02-12 22:10:41 UTC (rev 14408)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2015-02-13 17:35:51 UTC (rev 14409)
@@ -52,7 +52,7 @@
</data>
</request>
</start>
-
+
<test-suite name='support-report-set'>
<test name='1'>
<description>On notification collection</description>
@@ -97,6 +97,7 @@
<arg>
<name>totalcount</name>
<value>0</value>
+ <value>$calendar_sync_extra_count:</value>
</arg>
</verify>
<grabelement>
@@ -123,6 +124,7 @@
<arg>
<name>totalcount</name>
<value>0</value>
+ <value>$calendar_sync_extra_count:</value>
</arg>
</verify>
<grabelement>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml 2015-02-12 22:10:41 UTC (rev 14408)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml 2015-02-13 17:35:51 UTC (rev 14409)
@@ -66,7 +66,7 @@
</data>
</request>
</start>
-
+
<test-suite name='support-report-set/sync-token property'>
<test name='1'>
<description>Not on calendars</description>
@@ -241,7 +241,7 @@
</request>
</test>
</test-suite>
-
+
<test-suite name='simple reports - sync-level'>
<test name='1'>
<require-feature>
@@ -831,7 +831,7 @@
</verify>
</request>
</test>
- <test name='9'>
+ <test name='9'>
<description>remove new resource - calendar collection depth:1</description>
<request>
<method>REPORT</method>
@@ -2845,6 +2845,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
</arg>
</verify>
</request>
@@ -3507,5 +3508,5 @@
</test-suite>
<end/>
-
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml 2015-02-12 22:10:41 UTC (rev 14408)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml 2015-02-13 17:35:51 UTC (rev 14409)
@@ -306,6 +306,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$sharedaddressbook:/</value>
<value>$sharedaddressbook:/addressbook.vcf</value>
@@ -1190,6 +1191,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid1:/</value>
<value>$userguid1:/3.vcf</value>
@@ -1230,6 +1232,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>3.vcf</value>
</arg>
</verify>
@@ -2566,6 +2569,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid1:/</value>
<value>$userguid1:/1.vcf</value>
@@ -2591,6 +2595,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
<value>6.vcf</value>
@@ -2765,6 +2770,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid1:/</value>
<value>$userguid1:/1.vcf</value>
@@ -2810,6 +2816,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
<value>4.vcf</value>
@@ -3402,6 +3409,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid1:/</value>
<value>$userguid1:/4.vcf</value>
@@ -3444,6 +3452,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>4.vcf</value>
<value>5.vcf</value>
<value>7.vcf</value>
@@ -3873,6 +3882,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid2:/</value>
</arg>
@@ -3899,6 +3909,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid2:/</value>
</arg>
@@ -3925,6 +3936,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid2:/</value>
</arg>
@@ -3951,6 +3963,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$addressbook:/1.vcf</value>
<value>$addressbook:/2.vcf</value>
@@ -3982,6 +3995,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$addressbook:/1.vcf</value>
<value>$addressbook:/2.vcf</value>
@@ -4013,6 +4027,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$addressbook:/1.vcf</value>
<value>$addressbook:/2.vcf</value>
@@ -4041,6 +4056,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -4067,6 +4083,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -4093,6 +4110,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -4119,6 +4137,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -4145,6 +4164,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -4171,6 +4191,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -4219,6 +4240,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -4245,6 +4267,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid2:/</value>
</arg>
@@ -4271,6 +4294,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$addressbook:/1.vcf</value>
<value>$addressbook:/2.vcf</value>
@@ -4313,6 +4337,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
<value>3.vcf</value>
@@ -4340,6 +4365,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid2:/</value>
</arg>
@@ -4366,6 +4392,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$addressbook:/1.vcf</value>
<value>$addressbook:/2.vcf</value>
@@ -4405,6 +4432,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -4431,6 +4459,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid2:/</value>
</arg>
@@ -4457,6 +4486,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$addressbook:/1.vcf</value>
<value>$addressbook:/2.vcf</value>
@@ -4499,6 +4529,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -4525,6 +4556,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid2:/</value>
</arg>
@@ -4551,6 +4583,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$addressbook:/1.vcf</value>
<value>$addressbook:/2.vcf</value>
@@ -4582,6 +4615,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -4763,6 +4797,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -4805,6 +4840,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
<value>3.vcf</value>
@@ -4844,6 +4880,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -4886,6 +4923,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -4920,6 +4958,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -5278,6 +5317,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid3:/</value>
<value>$userguid3:/1.vcf</value>
@@ -5479,6 +5519,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid3:/</value>
<value>$userguid3:/1.vcf</value>
@@ -6022,6 +6063,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid3:/</value>
<value>$userguid4:/</value>
@@ -6207,6 +6249,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid3:/</value>
<value>$userguid4:/</value>
@@ -6431,6 +6474,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid3:/</value>
<value>$userguid4:/</value>
@@ -6621,6 +6665,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid3:/</value>
<value>$userguid3:/addressbook.vcf</value>
@@ -6747,6 +6792,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$userguid3:/</value>
<value>$userguid4:/</value>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml 2015-02-12 22:10:41 UTC (rev 14408)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml 2015-02-13 17:35:51 UTC (rev 14409)
@@ -46,7 +46,7 @@
</data>
</request>
</start>
-
+
<test-suite name='support-report-set'>
<test name='1'>
<description>Not on addressbooks</description>
@@ -174,7 +174,7 @@
</request>
</test>
</test-suite>
-
+
<test-suite name='simple reports - empty token - no props'>
<test name='1'>
<description>initial query - addressbook depth:1</description>
@@ -193,6 +193,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -219,6 +220,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
</arg>
</verify>
@@ -244,6 +246,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$addressbook:/1.vcf</value>
<value>$addressbook:/2.vcf</value>
@@ -282,6 +285,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
<value>3.vcf</value>
@@ -309,6 +313,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
</arg>
</verify>
@@ -334,6 +339,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$addressbook:/1.vcf</value>
<value>$addressbook:/2.vcf</value>
@@ -369,6 +375,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -395,6 +402,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
</arg>
</verify>
@@ -420,6 +428,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$addressbook:/1.vcf</value>
<value>$addressbook:/2.vcf</value>
@@ -458,6 +467,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -484,6 +494,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
</arg>
</verify>
@@ -509,6 +520,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$addressbook:/1.vcf</value>
<value>$addressbook:/2.vcf</value>
@@ -536,6 +548,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -717,6 +730,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -759,6 +773,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
<value>3.vcf</value>
@@ -798,6 +813,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -840,6 +856,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -874,6 +891,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>1.vcf</value>
<value>2.vcf</value>
</arg>
@@ -1116,6 +1134,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$addressbook:/1.vcf</value>
<value>$addressbook:/2.vcf</value>
@@ -1311,6 +1330,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>$calendar_sync_extra_items:</value>
<value>$addressbook:/</value>
<value>$addressbook:/1.vcf</value>
<value>$addressbook:/2.vcf</value>
@@ -1686,5 +1706,5 @@
<ruri>$notificationpath2:/</ruri>
</request>
</end>
-
+
</caldavtest>
Modified: CalDAVTester/trunk/verifiers/multistatusItems.py
===================================================================
--- CalDAVTester/trunk/verifiers/multistatusItems.py 2015-02-12 22:10:41 UTC (rev 14408)
+++ CalDAVTester/trunk/verifiers/multistatusItems.py 2015-02-13 17:35:51 UTC (rev 14409)
@@ -128,7 +128,10 @@
return result, resulttxt
# Check for total count
- if len(totalcount) == 1:
+ if len(totalcount) > 0:
+ # Add the 2nd value to the 1st if it exists
+ if len(totalcount) == 2:
+ totalcount[0] += totalcount[1]
if len(ok_result_set) != totalcount[0]:
result = False
resulttxt += " %d items returned, but %d items expected" % (len(ok_result_set), totalcount[0],)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150213/2460d616/attachment-0001.html>
More information about the calendarserver-changes
mailing list