[CalendarServer-changes] [8588] CalDAVTester/trunk/scripts
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jan 24 15:48:40 PST 2012
Revision: 8588
http://trac.macosforge.org/projects/calendarserver/changeset/8588
Author: cdaboo at apple.com
Date: 2012-01-24 15:48:39 -0800 (Tue, 24 Jan 2012)
Log Message:
-----------
Sync report now disabled on home collections.
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/caldavtest.dtd
CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2012-01-24 19:59:18 UTC (rev 8587)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2012-01-24 23:48:39 UTC (rev 8588)
@@ -49,6 +49,7 @@
<!-- <feature>quota-on-resources</feature> --> <!-- WebDAV QUOTA on calendar and address book object resources -->
<feature>resource-id</feature> <!-- WebDAV BIND DAV:resource-id property -->
<feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
+ <!-- <feature>sync-report_home</feature> --> <!-- WebDAV collection sync REPORT on Homes -->
<feature>well-known</feature> <!-- well-known feature -->
<!-- <feature>per-object-ACLs</feature> --> <!-- ACL for objects in calendar/address books -->
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2012-01-24 19:59:18 UTC (rev 8587)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2012-01-24 23:48:39 UTC (rev 8588)
@@ -227,6 +227,9 @@
<test-suite name='initial tokens - depth infinity' ignore='no'>
<test name='1' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>initial query - grab token</description>
<request print-response='no'>
<method>REPORT</method>
@@ -285,6 +288,9 @@
</request>
</test>
<test name='2' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>initial query - grab token</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>REPORT</method>
@@ -343,6 +349,9 @@
</test-suite>
<test-suite name='Read-write calendar - depth infinity - sharee delete'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<test name='1' ignore='no'>
<description>POST invitation</description>
<request print-response='no'>
@@ -539,6 +548,9 @@
</test-suite>
<test-suite name='Read-write calendar - depth infinity - sharer removes'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<test name='1' ignore='no'>
<description>POST invitation</description>
<request print-response='no'>
@@ -806,6 +818,9 @@
</test-suite>
<test-suite name='Shared calendar data - depth infinity'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<test name='1'>
<description>Sharer creates event</description>
<request>
@@ -1261,6 +1276,9 @@
</test-suite>
<test-suite name='Response cache' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<test name='1' ignore='no'>
<description>PROPFIND of current sync-token - direct</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml 2012-01-24 19:59:18 UTC (rev 8587)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml 2012-01-24 23:48:39 UTC (rev 8588)
@@ -115,6 +115,9 @@
<filepath>Resource/CalDAV/reports/sync/1.xml</filepath>
</data>
<verify>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<callback>xmlElementMatch</callback>
<arg>
<name>exists</name>
@@ -123,6 +126,9 @@
</arg>
</verify>
<verify>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
@@ -130,6 +136,30 @@
<value>{DAV:}sync-token</value>
</arg>
</verify>
+ <verify>
+ <exclude-feature>
+ <feature>sync-report-home</feature>
+ </exclude-feature>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}supported-report-set/{DAV:}supported-report/{DAV:}report/{DAV:}sync-collection</value>
+ </arg>
+ </verify>
+ <verify>
+ <exclude-feature>
+ <feature>sync-report-home</feature>
+ </exclude-feature>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}supported-report-set</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}sync-token</value>
+ </arg>
+ </verify>
</request>
</test>
<test name='3' ignore='no'>
@@ -197,7 +227,7 @@
<test-suite name='simple reports - empty token - no props' ignore='no'>
<test name='1' ignore='no'>
- <description>initial query - calenar collection depth:1</description>
+ <description>initial query - calendar collection depth:1</description>
<request print-response='no'>
<method>REPORT</method>
<ruri>$calendarhome1:/synccalendar1/</ruri>
@@ -220,6 +250,9 @@
</request>
</test>
<test name='2' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>initial query - home depth:1</description>
<request print-response='no'>
<method>REPORT</method>
@@ -276,6 +309,9 @@
</request>
</test>
<test name='3' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>initial query - home depth:infinity</description>
<request print-response='no'>
<method>REPORT</method>
@@ -378,6 +414,9 @@
</request>
</test>
<test name='6' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>new resource - home depth:1</description>
<request print-response='no'>
<method>REPORT</method>
@@ -434,6 +473,9 @@
</request>
</test>
<test name='7' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>new resource - home depth:infinity</description>
<request print-response='no'>
<method>REPORT</method>
@@ -533,6 +575,9 @@
</request>
</test>
<test name='10' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>remove new resource - home depth:1</description>
<request print-response='no'>
<method>REPORT</method>
@@ -589,6 +634,9 @@
</request>
</test>
<test name='11' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>remove new resource - home depth:infinity</description>
<request print-response='no'>
<method>REPORT</method>
@@ -690,6 +738,9 @@
</request>
</test>
<test name='14' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>changed resource - home depth:1</description>
<request print-response='no'>
<method>REPORT</method>
@@ -746,6 +797,9 @@
</request>
</test>
<test name='15' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>changed resource - home depth:infinity</description>
<request print-response='no'>
<method>REPORT</method>
@@ -1366,6 +1420,9 @@
</test-suite>
<test-suite name='simple reports - diff token - no props - home depth:infinity' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<test name='1' ignore='no'>
<description>Initialize</description>
<request print-response='no'>
@@ -1639,6 +1696,9 @@
</test-suite>
<test-suite name='simple reports - diff token - props - home depth:infinity' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<test name='1' ignore='no'>
<description>initial query - grab token</description>
<request print-response='no'>
@@ -1903,6 +1963,9 @@
</test-suite>
<test-suite name='simple reports - diff token - delete/create calendar - home depth:infinity' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<test name='1' ignore='no'>
<description>initial query - grab token</description>
<request print-response='no'>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd 2012-01-24 19:59:18 UTC (rev 8587)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd 2012-01-24 23:48:39 UTC (rev 8588)
@@ -47,7 +47,7 @@
<!ELEMENT content-type (#PCDATA)>
<!ELEMENT filepath (#PCDATA)>
- <!ELEMENT verify (callback, arg*)>
+ <!ELEMENT verify (require-feature?, exclude-feature?, callback, arg*)>
<!ELEMENT callback (#PCDATA)>
<!ELEMENT arg (name, value*)>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml 2012-01-24 19:59:18 UTC (rev 8587)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml 2012-01-24 23:48:39 UTC (rev 8588)
@@ -123,6 +123,9 @@
<filepath>Resource/CardDAV/vreports/sync/1.xml</filepath>
</data>
<verify>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<callback>xmlElementMatch</callback>
<arg>
<name>exists</name>
@@ -131,6 +134,9 @@
</arg>
</verify>
<verify>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
@@ -138,6 +144,30 @@
<value>{DAV:}sync-token</value>
</arg>
</verify>
+ <verify>
+ <exclude-feature>
+ <feature>sync-report-home</feature>
+ </exclude-feature>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}supported-report-set/{DAV:}supported-report/{DAV:}report/{DAV:}sync-collection</value>
+ </arg>
+ </verify>
+ <verify>
+ <exclude-feature>
+ <feature>sync-report-home</feature>
+ </exclude-feature>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}supported-report-set</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}sync-token</value>
+ </arg>
+ </verify>
</request>
</test>
<test name='3' ignore='no'>
@@ -198,6 +228,9 @@
</request>
</test>
<test name='2' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>initial query - home depth:1</description>
<request print-response='no'>
<method>REPORT</method>
@@ -222,6 +255,9 @@
</request>
</test>
<test name='3' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>initial query - home depth:infinity</description>
<request print-response='no'>
<method>REPORT</method>
@@ -288,6 +324,9 @@
</request>
</test>
<test name='6' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>new resource - home depth:1</description>
<request print-response='no'>
<method>REPORT</method>
@@ -312,6 +351,9 @@
</request>
</test>
<test name='7' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>new resource - home depth:infinity</description>
<request print-response='no'>
<method>REPORT</method>
@@ -374,6 +416,9 @@
</request>
</test>
<test name='10' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>remove new resource - home depth:1</description>
<request print-response='no'>
<method>REPORT</method>
@@ -398,6 +443,9 @@
</request>
</test>
<test name='11' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>remove new resource - home depth:infinity</description>
<request print-response='no'>
<method>REPORT</method>
@@ -463,6 +511,9 @@
</request>
</test>
<test name='14' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>changed resource - home depth:1</description>
<request print-response='no'>
<method>REPORT</method>
@@ -487,6 +538,9 @@
</request>
</test>
<test name='15' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<description>changed resource - home depth:infinity</description>
<request print-response='no'>
<method>REPORT</method>
@@ -1071,6 +1125,9 @@
</test-suite>
<test-suite name='simple reports - diff token - no props - home depth:infinity' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<test name='1' ignore='no'>
<description>Initialize</description>
<request print-response='no'>
@@ -1316,6 +1373,9 @@
</test-suite>
<test-suite name='simple reports - diff token - props - home depth:infinity' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<test name='1' ignore='no'>
<description>initial query - grab token</description>
<request print-response='no'>
@@ -1556,6 +1616,9 @@
</test-suite>
<test-suite name='simple reports - diff token - delete/create addressbook - home depth:infinity' ignore='no'>
+ <require-feature>
+ <feature>sync-report-home</feature>
+ </require-feature>
<test name='1' ignore='no'>
<description>initial query - grab token</description>
<request print-response='no'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120124/94541f37/attachment-0001.html>
More information about the calendarserver-changes
mailing list