[CalendarServer-changes] [12177] CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-moves.xml
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:23:54 PDT 2014
Revision: 12177
http://trac.calendarserver.org//changeset/12177
Author: cdaboo at apple.com
Date: 2013-12-20 12:36:58 -0800 (Fri, 20 Dec 2013)
Log Message:
-----------
Checkpoint: cross-pod resource moves.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-moves.xml
Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-moves.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-moves.xml 2013-12-20 20:23:30 UTC (rev 12176)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-moves.xml 2013-12-20 20:36:58 UTC (rev 12177)
@@ -18,7 +18,7 @@
limitations under the License.
-->
-<caldavtest ignore-all='no'>
+<caldavtest>
<description>Test calendar sharing and MOVE</description>
<require-feature>
@@ -36,17 +36,17 @@
<ruri>$calendarhome1:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/POST/sharinginvite2.xml</filepath>
+ <filepath>Resource/Common/POST/sharinginvite2-pod.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
<method>WAITCOUNT 1</method>
<ruri>$pnotificationpath2:/</ruri>
</request>
- <request user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
<method>GETNEW</method>
<ruri>$pnotificationpath2:/</ruri>
<grabelement>
@@ -58,12 +58,12 @@
<variable>$hosturl2:</variable>
</grabelement>
</request>
- <request user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
<method>POST</method>
<ruri>$pcalendarhome2:/</ruri>
<data substitutions='yes'>
<content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/POST/sharingreply2.xml</filepath>
+ <filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
</data>
<grabelement>
<name>{DAV:}href</name>
@@ -72,12 +72,12 @@
</request>
</start>
- <test-suite name='OK event to shared calendar' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='OK event to shared calendar'>
+ <test name='1'>
<description>User02 store to personal calendar</description>
- <request user="$puserid2:" pswd="$ppswd2:" print-response="no">
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
<method>PUT</method>
- <ruri>$calendarpath2:/1.ics</ruri>
+ <ruri>$pcalendarpath2:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/sharing/moves/1.ics</filepath>
@@ -87,23 +87,23 @@
</verify>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>User02 moves event to shared calendar</description>
- <request user="$puserid2:" pswd="$ppswd2:" print-response="no">
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
<method>MOVE</method>
- <ruri>$calendarpath2:/1.ics</ruri>
+ <ruri>$pcalendarpath2:/1.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$sharedcalendar2:/1.ics</value>
+ <value>$host2:$sharedcalendar2:/1.ics</value>
</header>
<verify>
<callback>statusCode</callback>
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>User02 sees event</description>
- <request user="$puserid2:" pswd="$ppswd2:" print-response="no">
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
<method>GET</method>
<ruri>$sharedcalendar2:/1.ics</ruri>
<verify>
@@ -115,9 +115,9 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>User01 sees event</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarhome1:/shared/1.ics</ruri>
<verify>
@@ -132,12 +132,12 @@
</test-suite>
- <test-suite name='Bad event to shared calendar' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='Bad event to shared calendar'>
+ <test name='1'>
<description>User02 store to personal calendar</description>
- <request user="$puserid2:" pswd="$ppswd2:" end-delete="yes" print-response="no">
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:" end-delete="yes">
<method>PUT</method>
- <ruri>$calendarpath2:/2.ics</ruri>
+ <ruri>$pcalendarpath2:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/sharing/moves/2.ics</filepath>
@@ -147,14 +147,14 @@
</verify>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>User02 moves event to shared calendar</description>
- <request user="$puserid2:" pswd="$ppswd2:" print-response="no">
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
<method>MOVE</method>
- <ruri>$calendarpath2:/2.ics</ruri>
+ <ruri>$pcalendarpath2:/2.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$sharedcalendar2:/2.ics</value>
+ <value>$host2:$sharedcalendar2:/2.ics</value>
</header>
<verify>
<callback>statusCode</callback>
@@ -167,10 +167,10 @@
</test>
</test-suite>
- <test-suite name='OK event from shared calendar' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='OK event from shared calendar'>
+ <test name='1'>
<description>User01 store to shared calendar</description>
- <request print-response="no">
+ <request>
<method>PUT</method>
<ruri>$calendarhome1:/shared/3.ics</ruri>
<data>
@@ -182,25 +182,25 @@
</verify>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>User02 moves event from shared calendar</description>
- <request user="$puserid2:" pswd="$ppswd2:" print-response="no">
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
<method>MOVE</method>
<ruri>$sharedcalendar2:/3.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$calendarpath2:/3.ics</value>
+ <value>$host2:$pcalendarpath2:/3.ics</value>
</header>
<verify>
<callback>statusCode</callback>
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>User02 sees event</description>
- <request user="$puserid2:" pswd="$ppswd2:" print-response="no">
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
<method>GET</method>
- <ruri>$calendarpath2:/3.ics</ruri>
+ <ruri>$pcalendarpath2:/3.ics</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -209,17 +209,17 @@
</arg>
</verify>
</request>
- <request user="$puserid2:" pswd="$ppswd2:" print-response="no">
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
<method>DELETE</method>
- <ruri>$calendarpath2:/3.ics</ruri>
+ <ruri>$pcalendarpath2:/3.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>User01 sees no event</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarhome1:/shared/3.ics</ruri>
<verify>
@@ -234,10 +234,10 @@
</test-suite>
- <test-suite name='Bad event to shared calendar' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='Bad event to shared calendar'>
+ <test name='1'>
<description>User01 store to shared calendar</description>
- <request end-delete="yes" print-response="no">
+ <request end-delete="yes">
<method>PUT</method>
<ruri>$calendarhome1:/shared/4.ics</ruri>
<data>
@@ -249,14 +249,14 @@
</verify>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>User02 moves event from shared calendar</description>
- <request user="$puserid2:" pswd="$ppswd2:" print-response="no">
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
<method>MOVE</method>
<ruri>$sharedcalendar2:/4.ics</ruri>
<header>
<name>Destination</name>
- <value>$host:$calendarpath2:/4.ics</value>
+ <value>$host2:$pcalendarpath2:/4.ics</value>
</header>
<verify>
<callback>statusCode</callback>
@@ -269,10 +269,10 @@
</test>
</test-suite>
- <test-suite name='OK owner event to shared calendar' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='OK owner event to shared calendar'>
+ <test name='1'>
<description>User01 store to personal calendar</description>
- <request print-response="no">
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/5.ics</ruri>
<data>
@@ -284,9 +284,9 @@
</verify>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>User01 moves event to shared calendar</description>
- <request print-response="no">
+ <request>
<method>MOVE</method>
<ruri>$calendarpath1:/5.ics</ruri>
<header>
@@ -298,9 +298,9 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>User02 sees event</description>
- <request user="$puserid2:" pswd="$ppswd2:" print-response="no">
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
<method>GET</method>
<ruri>$sharedcalendar2:/5.ics</ruri>
<verify>
@@ -312,9 +312,9 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>User01 sees event</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarhome1:/shared/5.ics</ruri>
<verify>
@@ -325,7 +325,7 @@
</arg>
</verify>
</request>
- <request print-response="no">
+ <request>
<method>DELETE</method>
<ruri>$calendarhome1:/shared/5.ics</ruri>
<verify>
@@ -336,10 +336,10 @@
</test-suite>
- <test-suite name='OK owner event with organizer to shared calendar' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='OK owner event with organizer to shared calendar'>
+ <test name='1'>
<description>User01 store to personal calendar</description>
- <request print-response="no">
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/6.ics</ruri>
<data>
@@ -351,9 +351,9 @@
</verify>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>User01 moves event to shared calendar</description>
- <request print-response="no">
+ <request>
<method>MOVE</method>
<ruri>$calendarpath1:/6.ics</ruri>
<header>
@@ -365,9 +365,9 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>User02 sees event</description>
- <request user="$puserid2:" pswd="$ppswd2:" print-response="no">
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
<method>GET</method>
<ruri>$sharedcalendar2:/6.ics</ruri>
<verify>
@@ -379,9 +379,9 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>User01 sees event</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarhome1:/shared/6.ics</ruri>
<verify>
@@ -392,7 +392,7 @@
</arg>
</verify>
</request>
- <request print-response="no">
+ <request>
<method>DELETE</method>
<ruri>$calendarhome1:/shared/6.ics</ruri>
<verify>
@@ -402,10 +402,10 @@
</test>
</test-suite>
- <test-suite name='OK owner event from shared calendar' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='OK owner event from shared calendar'>
+ <test name='1'>
<description>User01 store to shared calendar</description>
- <request print-response="no">
+ <request>
<method>PUT</method>
<ruri>$calendarhome1:/shared/7.ics</ruri>
<data>
@@ -417,9 +417,9 @@
</verify>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>User01 moves event from shared calendar</description>
- <request print-response="no">
+ <request>
<method>MOVE</method>
<ruri>$calendarhome1:/shared/7.ics</ruri>
<header>
@@ -431,9 +431,9 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>User02 does not see event</description>
- <request user="$puserid2:" pswd="$ppswd2:" print-response="no">
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
<method>GET</method>
<ruri>$sharedcalendar2:/7.ics</ruri>
<verify>
@@ -445,9 +445,9 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>User01 sees event</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/7.ics</ruri>
<verify>
@@ -458,7 +458,7 @@
</arg>
</verify>
</request>
- <request print-response="no">
+ <request>
<method>DELETE</method>
<ruri>$calendarpath1:/7.ics</ruri>
<verify>
@@ -469,10 +469,10 @@
</test-suite>
- <test-suite name='OK owner event with organizer from shared calendar' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='OK owner event with organizer from shared calendar'>
+ <test name='1'>
<description>User01 store to shared calendar</description>
- <request print-response="no">
+ <request>
<method>PUT</method>
<ruri>$calendarhome1:/shared/8.ics</ruri>
<data>
@@ -484,9 +484,9 @@
</verify>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>User01 moves event from shared calendar</description>
- <request print-response="no">
+ <request>
<method>MOVE</method>
<ruri>$calendarhome1:/shared/8.ics</ruri>
<header>
@@ -498,9 +498,9 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>User02 does not see event</description>
- <request user="$puserid2:" pswd="$ppswd2:" print-response="no">
+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
<method>GET</method>
<ruri>$sharedcalendar2:/8.ics</ruri>
<verify>
@@ -512,9 +512,9 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>User01 sees event</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/8.ics</ruri>
<verify>
@@ -525,7 +525,7 @@
</arg>
</verify>
</request>
- <request print-response="no">
+ <request>
<method>DELETE</method>
<ruri>$calendarpath1:/8.ics</ruri>
<verify>
@@ -539,6 +539,9 @@
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$notificationpath1:/</ruri>
+ </request>
+ <request host2="yes" user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
<ruri>$pnotificationpath2:/</ruri>
</request>
</end>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/c0eb7b7d/attachment.html>
More information about the calendarserver-changes
mailing list