[CalendarServer-changes] [12537] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:23:35 PDT 2014
Revision: 12537
http://trac.calendarserver.org//changeset/12537
Author: cdaboo at apple.com
Date: 2014-02-02 14:26:27 -0800 (Sun, 02 Feb 2014)
Log Message:
-----------
Support for asynchronous scheduling.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml
CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitallday.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto11.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto2.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto3.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto4.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto5.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto8.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto9.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomodes.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitbadclients.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitbatchrefresh.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitcompatibility.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitdropbox.xml
CalDAVTester/trunk/scripts/tests/CalDAV/impliciterrors.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitlarge.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstatchange.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstattimestamp.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitprivateevents.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitproxy.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitpublicproperties.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur1.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur2.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitreschedule.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario2.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario3.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduleagent.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitschedulechanges.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitsecurity.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitsequence.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitsharing.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicittimezones.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml
CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml
CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml
CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml
CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostmaskuid.xml
CalDAVTester/trunk/src/caldavtest.py
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -481,7 +481,7 @@
<test-suite name='Scheduling' ignore='no'>
<test name='1'>
<description>Check for CTag on calendar</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$calendarpath1:/</ruri>
<header>
@@ -507,7 +507,7 @@
</test>
<test name='2'>
<description>Check for CTag on inbox</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$inboxpath1:/</ruri>
<header>
@@ -533,7 +533,7 @@
</test>
<test name='3'>
<description>PUT invite</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$calendarpath2:/2.ics</ruri>
<data>
@@ -544,10 +544,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
</test>
<test name="4">
<description>Test calendar ctag change</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$calendarpath1:/</ruri>
<header>
@@ -569,7 +573,7 @@
</test>
<test name="5">
<description>Test inbox ctag change</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$inboxpath1:/</ruri>
<header>
@@ -594,7 +598,7 @@
<test-suite name='Same for each Depth'>
<test name='1'>
<description>Check for CTag Depth:0</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$calendarpath1:/</ruri>
<header>
@@ -620,7 +624,7 @@
</test>
<test name='2'>
<description>Check for CTag Depth:1</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$calendarhome1:/</ruri>
<header>
@@ -660,7 +664,7 @@
</test>
<test name='4'>
<description>Check for CTag Depth:0</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$calendarpath1:/</ruri>
<header>
@@ -686,7 +690,7 @@
</test>
<test name='5'>
<description>Check for CTag Depth:1</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$calendarhome1:/</ruri>
<header>
@@ -722,7 +726,7 @@
</test>
<test name='7'>
<description>Check for CTag Depth:0</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$calendarpath1:/</ruri>
<header>
@@ -748,7 +752,7 @@
</test>
<test name='8'>
<description>Check for CTag Depth:1</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$calendarhome1:/</ruri>
<header>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -73,7 +73,7 @@
<filepath>Resource/CalDAV/extended-freebusy/4.ics</filepath>
</data>
</request>
- <!-- Add Event #3 to user03 calendar -->
+ <!-- Add Event #4 to user04 calendar -->
<request user="$userid4:" pswd="$pswd4:" end-delete="yes">
<method>PUT</method>
<ruri>$calendarpath4:/1.ics</ruri>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitallday.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitallday.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitallday.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -35,16 +35,6 @@
<method>GET</method>
<ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
- </request>
</start>
<test-suite name='Simple Changes' ignore='no'>
@@ -230,22 +220,20 @@
</verify>
</request>
</test>
- <test name='19'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
@@ -434,22 +422,20 @@
</verify>
</request>
</test>
- <test name='19'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -41,10 +41,10 @@
</request>
</start>
- <test-suite name='Non-recurring' ignore='no'>
+ <test-suite name='Non-recurring'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -58,7 +58,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -72,21 +72,21 @@
</test>
<test name='3'>
<description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee 2 -> Declined</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -101,14 +101,14 @@
</test>
<test name='5'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='6'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -122,7 +122,7 @@
</test>
<test name='7'>
<description>Attendee 2 -> DELETE</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$attendee2_event:</ruri>
<verify>
@@ -132,7 +132,7 @@
</test>
<test name='8'>
<description>Organizer No Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>DELAY</method>
<ruri>1</ruri>
</request>
@@ -162,7 +162,7 @@
<method>DELETEALL</method>
<ruri>$inboxpath3:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -176,14 +176,14 @@
</test>
<test name='10'>
<description>Attendee 3 Inbox Item</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='11'>
<description>Attendee 3 has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -198,7 +198,7 @@
</test>
<test name='12'>
<description>Attendee 2 No Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>DELAY</method>
<ruri>1</ruri>
</request>
@@ -246,7 +246,7 @@
</test>
<test name='14'>
<description>Attendee 3 -> Accepted</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$attendee3_event:</ruri>
<data>
@@ -260,14 +260,14 @@
</test>
<test name='15'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='16'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -281,7 +281,7 @@
</test>
<test name='17'>
<description>Attendee 2 No Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>DELAY</method>
<ruri>1</ruri>
</request>
@@ -333,7 +333,7 @@
<method>DELETEALL</method>
<ruri>$inboxpath3:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -347,14 +347,14 @@
</test>
<test name='20'>
<description>Attendee 3 Inbox Item</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='21'>
<description>Attendee 3 has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GET</method>
<ruri>$attendee3_event:</ruri>
<verify>
@@ -368,14 +368,14 @@
</test>
<test name='22'>
<description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='23'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -395,11 +395,19 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
<ruri>$inboxpath3:/</ruri>
@@ -407,10 +415,10 @@
</test>
</test-suite>
- <test-suite name='Recurring with master' ignore='no'>
+ <test-suite name='Recurring with master'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -424,7 +432,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -437,22 +445,26 @@
</request>
</test>
<test name='3'>
- <description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>Attendee 2/3 Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
</test>
<test name='4'>
<description>Attendee 2 -> Accept all, except one Declined</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -467,14 +479,14 @@
</test>
<test name='5'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='6'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -488,7 +500,7 @@
</test>
<test name='7'>
<description>Attendee 2 -> EXDATE declined instance</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$attendee2_event:</ruri>
<data>
@@ -502,7 +514,7 @@
</test>
<test name='8'>
<description>Organizer No Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>DELAY</method>
<ruri>1</ruri>
</request>
@@ -532,7 +544,7 @@
<method>DELETEALL</method>
<ruri>$inboxpath3:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -546,14 +558,14 @@
</test>
<test name='10'>
<description>Attendee 3 Inbox Item</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='11'>
<description>Attendee 3 has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -568,14 +580,14 @@
</test>
<test name='12'>
<description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='13'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$attendee2_event:</ruri>
<verify>
@@ -589,7 +601,7 @@
</test>
<test name='14'>
<description>Attendee 3 -> Accepted</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$attendee3_event:</ruri>
<data>
@@ -603,14 +615,14 @@
</test>
<test name='15'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='16'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -624,7 +636,7 @@
</test>
<test name='17'>
<description>Attendee 2 No Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>DELAY</method>
<ruri>1</ruri>
</request>
@@ -650,7 +662,7 @@
</test>
<test name='18'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:" wait-for-success="yes">
<method>GET</method>
<ruri>$attendee2_event:</ruri>
<verify>
@@ -668,7 +680,7 @@
<method>DELETEALL</method>
<ruri>$inboxpath3:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -682,14 +694,14 @@
</test>
<test name='20'>
<description>Attendee 3 Inbox Item</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='21'>
<description>Attendee 3 has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GET</method>
<ruri>$attendee3_event:</ruri>
<verify>
@@ -703,14 +715,14 @@
</test>
<test name='22'>
<description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='23'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$attendee2_event:</ruri>
<verify>
@@ -724,7 +736,7 @@
</test>
<test name='24'>
<description>Attendee 2 -> DELETE</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$attendee2_event:</ruri>
<verify>
@@ -734,14 +746,14 @@
</test>
<test name='25'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='26'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -759,7 +771,7 @@
<method>DELETEALL</method>
<ruri>$inboxpath3:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -772,15 +784,19 @@
</request>
</test>
<test name='28'>
- <description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>Attendee 2/3 Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
</test>
<test name='29'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -800,11 +816,19 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
<ruri>$inboxpath3:/</ruri>
@@ -812,10 +836,10 @@
</test>
</test-suite>
- <test-suite name='Recurring without master' ignore='no'>
+ <test-suite name='Recurring without master'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -829,7 +853,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -842,22 +866,26 @@
</request>
</test>
<test name='3'>
- <description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>Attendee 2/3 Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
</test>
<test name='4'>
<description>Attendee 2 -> Accept one, Decline one</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -872,14 +900,14 @@
</test>
<test name='5'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='6'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -893,7 +921,7 @@
</test>
<test name='7'>
<description>Attendee 2 -> remove declined instance</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$attendee2_event:</ruri>
<data>
@@ -907,7 +935,7 @@
</test>
<test name='8'>
<description>Organizer No Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>DELAY</method>
<ruri>1</ruri>
</request>
@@ -937,7 +965,7 @@
<method>DELETEALL</method>
<ruri>$inboxpath3:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -951,14 +979,14 @@
</test>
<test name='10'>
<description>Attendee 3 Inbox Item</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='11'>
<description>Attendee 3 has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -973,14 +1001,14 @@
</test>
<test name='12'>
<description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='13'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$attendee2_event:</ruri>
<verify>
@@ -994,7 +1022,7 @@
</test>
<test name='14'>
<description>Attendee 3 -> Accepted</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$attendee3_event:</ruri>
<data>
@@ -1008,14 +1036,14 @@
</test>
<test name='15'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='16'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1029,7 +1057,7 @@
</test>
<test name='17'>
<description>Attendee 2 No Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>DELAY</method>
<ruri>1</ruri>
</request>
@@ -1055,7 +1083,7 @@
</test>
<test name='18'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:" wait-for-success="yes">
<method>GET</method>
<ruri>$attendee2_event:</ruri>
<verify>
@@ -1069,11 +1097,7 @@
</test>
<test name='19'>
<description>Organizer changes time of declined instance</description>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
- </request>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1087,14 +1111,14 @@
</test>
<test name='20'>
<description>Attendee 3 Inbox Item</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='21'>
<description>Attendee 3 has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GET</method>
<ruri>$attendee3_event:</ruri>
<verify>
@@ -1108,14 +1132,14 @@
</test>
<test name='22'>
<description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='23'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$attendee2_event:</ruri>
<verify>
@@ -1129,7 +1153,7 @@
</test>
<test name='24'>
<description>Attendee 2 -> DELETE</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$attendee2_event:</ruri>
<verify>
@@ -1139,14 +1163,14 @@
</test>
<test name='25'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='26'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1164,7 +1188,7 @@
<method>DELETEALL</method>
<ruri>$inboxpath3:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1177,15 +1201,19 @@
</request>
</test>
<test name='28'>
- <description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>Attendee 2/3 Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
</test>
<test name='29'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1205,11 +1233,19 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
<ruri>$inboxpath3:/</ruri>
@@ -1217,10 +1253,10 @@
</test>
</test-suite>
- <test-suite name='Recurring without master - delete of undeclined instance' ignore='no'>
+ <test-suite name='Recurring without master - delete of undeclined instance'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1234,7 +1270,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1247,22 +1283,26 @@
</request>
</test>
<test name='3'>
- <description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>Attendee 2/3 Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
</test>
<test name='4'>
<description>Attendee 2 -> Remove one</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1277,14 +1317,14 @@
</test>
<test name='5'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='6'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1298,7 +1338,7 @@
</test>
<test name='7'>
<description>Attendee 2 -> accept remaining instance</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$attendee2_event:</ruri>
<data>
@@ -1312,7 +1352,7 @@
</test>
<test name='8'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
@@ -1323,7 +1363,7 @@
<method>DELETEALL</method>
<ruri>$inboxpath3:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1337,14 +1377,14 @@
</test>
<test name='10'>
<description>Attendee 3 Inbox Item</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='11'>
<description>Attendee 3 has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -1359,14 +1399,14 @@
</test>
<test name='12'>
<description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='13'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$attendee2_event:</ruri>
<verify>
@@ -1380,7 +1420,7 @@
</test>
<test name='14'>
<description>Attendee 3 -> Accepted</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$attendee3_event:</ruri>
<data>
@@ -1394,14 +1434,14 @@
</test>
<test name='15'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='16'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1415,7 +1455,7 @@
</test>
<test name='17'>
<description>Attendee 2 No Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>DELAY</method>
<ruri>1</ruri>
</request>
@@ -1441,7 +1481,7 @@
</test>
<test name='18'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:" wait-for-success="yes">
<method>GET</method>
<ruri>$attendee2_event:</ruri>
<verify>
@@ -1459,7 +1499,7 @@
<method>DELETEALL</method>
<ruri>$inboxpath3:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1473,14 +1513,14 @@
</test>
<test name='20'>
<description>Attendee 3 Inbox Item</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='21'>
<description>Attendee 3 has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GET</method>
<ruri>$attendee3_event:</ruri>
<verify>
@@ -1494,14 +1534,14 @@
</test>
<test name='22'>
<description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='23'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$attendee2_event:</ruri>
<verify>
@@ -1515,7 +1555,7 @@
</test>
<test name='24'>
<description>Attendee 2 -> DELETE</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$attendee2_event:</ruri>
<verify>
@@ -1525,14 +1565,14 @@
</test>
<test name='25'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='26'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1546,11 +1586,7 @@
</test>
<test name='27'>
<description>Organizer changes time of one declined instance, summary of other</description>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
- </request>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1563,15 +1599,19 @@
</request>
</test>
<test name='28'>
- <description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>Attendee 2/3 Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
</test>
<test name='29'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1591,11 +1631,19 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
<ruri>$inboxpath3:/</ruri>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -1146,29 +1146,23 @@
<end>
<request>
<method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
<ruri>$inboxpath1:/</ruri>
</request>
- <request>
- <method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
- </request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
+ <method>WAITDELETEALL 5</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$useradmin:" pswd="$pswdadmin:">
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
+ <ruri>$rcalendarpath1:/</ruri>
<ruri>$rinboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rcalendarpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
<method>PROPPATCH</method>
<ruri>$rcalendarpath1:/</ruri>
<data>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -255,6 +255,10 @@
<test name='15' ignore='no'>
<description>No item in resource08 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath8:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GET</method>
<ruri>$r1:</ruri>
<verify>
@@ -413,18 +417,22 @@
<end>
<request>
<method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
<ruri>$inboxpath1:/</ruri>
- <ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
- <ruri>$calendarpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
+ <ruri>$rcalendarpath8:/</ruri>
<ruri>$rinboxpath8:/</ruri>
- <ruri>$rcalendarpath8:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto11.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto11.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto11.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -207,6 +207,10 @@
<test name='12' ignore='no'>
<description>No item in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <method>WAITCOUNT 0</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>GET</method>
<ruri>$r1:</ruri>
<verify>
@@ -242,6 +246,10 @@
<ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
<ruri>$calendarpath2:/</ruri>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto2.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto2.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto2.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -27,20 +27,7 @@
<feature>implicit-scheduling</feature>
</require-feature>
- <start>
- <request>
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rcalendarpath1:/</ruri>
- </request>
- </start>
+ <start/>
<test-suite name='#1 Recurring Master' ignore='no'>
<test name='1' ignore='no'>
@@ -120,10 +107,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -209,10 +192,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -298,10 +277,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -387,10 +362,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -476,10 +447,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -565,10 +532,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -654,10 +617,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -743,10 +702,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -758,25 +713,10 @@
<request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
- </request>
- <request>
- <method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
+ <method>WAITCOUNT 0</method>
<ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto3.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto3.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto3.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -27,20 +27,7 @@
<feature>implicit-scheduling</feature>
</require-feature>
- <start>
- <request>
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rcalendarpath1:/</ruri>
- </request>
- </start>
+ <start/>
<test-suite name='#1 Recurring Master' ignore='no'>
<test name='1' ignore='no'>
@@ -228,10 +215,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -317,10 +300,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -406,10 +385,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -514,10 +489,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -622,10 +593,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -711,10 +678,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -800,10 +763,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -815,25 +774,10 @@
<request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
- </request>
- <request>
- <method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
+ <method>WAITCOUNT 0</method>
<ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto4.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto4.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto4.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -27,20 +27,7 @@
<feature>implicit-scheduling</feature>
</require-feature>
- <start>
- <request>
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rcalendarpath1:/</ruri>
- </request>
- </start>
+ <start/>
<test-suite name='#1 5-day recurrence' ignore='no'>
<test name='1' ignore='no'>
@@ -120,10 +107,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -209,10 +192,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -298,10 +277,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -313,25 +288,10 @@
<request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
- </request>
- <request>
- <method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
+ <method>WAITCOUNT 0</method>
<ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto5.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto5.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto5.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -27,20 +27,7 @@
<feature>implicit-scheduling</feature>
</require-feature>
- <start>
- <request>
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rcalendarpath1:/</ruri>
- </request>
- </start>
+ <start/>
<test-suite name='#1 Block out one day in a week' ignore='no'>
<test name='1' ignore='no'>
@@ -120,10 +107,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -209,10 +192,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -298,10 +277,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -387,10 +362,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -402,25 +373,10 @@
<request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
- </request>
- <request>
- <method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
+ <method>WAITCOUNT 0</method>
<ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -27,20 +27,7 @@
<feature>implicit-scheduling</feature>
</require-feature>
- <start>
- <request>
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rcalendarpath1:/</ruri>
- </request>
- </start>
+ <start/>
<test-suite name='#1 Block out unbounded' ignore='no'>
<test name='1' ignore='no'>
@@ -120,10 +107,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -209,10 +192,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -298,10 +277,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -387,10 +362,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -499,10 +470,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -588,10 +555,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -603,25 +566,10 @@
<request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
- </request>
- <request>
- <method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
+ <method>WAITCOUNT 0</method>
<ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -31,27 +31,13 @@
<request user="$userid1:" pswd="$pswd1:">
<method>GET</method>
<ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$calendarpath2:/</ruri>
- </request>
- <request>
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rcalendarpath1:/</ruri>
- </request>
</start>
<test-suite name='#1 Non-recurring all-day without conflict' ignore='no'>
@@ -718,25 +704,19 @@
<request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
- </request>
- <request>
- <method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
+ <method>WAITCOUNT 6</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$useradmin:" pswd="$pswdadmin:">
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
+ <ruri>$inboxpath2:/</ruri>
<ruri>$calendarpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
+ <method>WAITCOUNT 0</method>
<ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto8.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto8.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto8.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -32,15 +32,6 @@
<method>GET</method>
<ruri>$calendarpath1:/</ruri>
</request>
- <request>
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rcalendarpath1:/</ruri>
- <ruri>$rinboxpath1:/</ruri>
- </request>
</start>
<test-suite name='#1 Non-recurring' ignore='no'>
@@ -108,7 +99,7 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>Two items in user01 Inbox</description>
+ <description>One item in user01 Inbox</description>
<request print-response="no">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
@@ -220,7 +211,7 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>Two items in user01 Inbox</description>
+ <description>One item in user01 Inbox</description>
<request print-response="no">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
@@ -274,9 +265,8 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
+ <method>WAITCOUNT 0</method>
<ruri>$rcalendarpath1:/</ruri>
- <ruri>$rinboxpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto9.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto9.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto9.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -27,20 +27,7 @@
<feature>implicit-scheduling</feature>
</require-feature>
- <start>
- <request>
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rcalendarpath1:/</ruri>
- </request>
- </start>
+ <start/>
<test-suite name='#1 Decline one valid instance' ignore='no'>
<test name='1' ignore='no'>
@@ -316,10 +303,6 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
@@ -331,25 +314,10 @@
<request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
- </request>
- <request>
- <method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
+ <method>WAITCOUNT 0</method>
<ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -35,23 +35,6 @@
<method>GET</method>
<ruri>$calendarpath3:/</ruri>
</request>
- <request>
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rcalendarpath11:/</ruri>
- <ruri>$rinboxpath11:/</ruri>
- </request>
</start>
<test-suite name='#1 Group organizer: accepted' ignore='no'>
@@ -379,6 +362,10 @@
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$inboxpath3:/</ruri>
@@ -390,7 +377,7 @@
</test>
</test-suite>
- <test-suite name='#4 Group organizer: accepted ast same time as non-group organizer decline' ignore='no'>
+ <test-suite name='#4 Group organizer: accepted at same time as non-group organizer decline' ignore='no'>
<test name='1' ignore='no'>
<description>Create new event</description>
<request>
@@ -514,14 +501,17 @@
<ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITCOUNT 4</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$inboxpath3:/</ruri>
<ruri>$calendarpath3:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
+ <method>WAITCOUNT 0</method>
<ruri>$rcalendarpath11:/</ruri>
- <ruri>$rinboxpath11:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomodes.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomodes.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomodes.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -33,18 +33,10 @@
<method>GET</method>
<ruri>$calendarpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>GET</method>
- <ruri>$calendarpath2:/</ruri>
- </request>
<request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath5:/</ruri>
@@ -62,8 +54,8 @@
</request>
</start>
- <test-suite name='#1 Mode none: Non-recurring free' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#1 Mode none: Non-recurring free'>
+ <test name='1'>
<description>Blocking event resource05</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -81,7 +73,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -95,9 +87,9 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>No items in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>PROPFIND</method>
<ruri>$inboxpath1:/</ruri>
<header>
@@ -117,9 +109,9 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -131,16 +123,16 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>One item in resource05 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>WAITDELETEALL 1</method>
<ruri>$rinboxpath5:/</ruri>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource05 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath5:/</ruri>
<verify>
@@ -152,7 +144,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -160,6 +152,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath5:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath5:/</ruri>
<ruri>$rinboxpath5:/</ruri>
@@ -167,8 +163,8 @@
</test>
</test-suite>
- <test-suite name='#2 Mode none: Non-recurring busy' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#2 Mode none: Non-recurring busy'>
+ <test name='1'>
<description>Blocking event resource05</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -186,7 +182,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -204,9 +200,9 @@
<ruri>$rinboxpath5:/</ruri>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>No items in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>PROPFIND</method>
<ruri>$inboxpath1:/</ruri>
<header>
@@ -226,9 +222,9 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -240,16 +236,16 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>One item in resource05 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>WAITDELETEALL 1</method>
<ruri>$rinboxpath5:/</ruri>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource05 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath5:/</ruri>
<verify>
@@ -261,7 +257,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -269,6 +265,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath5:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath5:/</ruri>
<ruri>$rinboxpath5:/</ruri>
@@ -276,8 +276,8 @@
</test>
</test-suite>
- <test-suite name='#3 Mode none: Recurring' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#3 Mode none: Recurring'>
+ <test name='1'>
<description>Blocking event resource05</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -295,7 +295,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -309,9 +309,9 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>No items in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>PROPFIND</method>
<ruri>$inboxpath1:/</ruri>
<header>
@@ -331,9 +331,9 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -345,16 +345,16 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>One item in resource05 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>WAITDELETEALL 1</method>
<ruri>$rinboxpath5:/</ruri>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource05 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath5:/</ruri>
<verify>
@@ -366,7 +366,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -374,6 +374,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath5:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath5:/</ruri>
<ruri>$rinboxpath5:/</ruri>
@@ -381,8 +385,8 @@
</test>
</test-suite>
- <test-suite name='#4 Mode accept-always: Non-recurring free' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#4 Mode accept-always: Non-recurring free'>
+ <test name='1'>
<description>Blocking event resource06</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -400,7 +404,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -414,16 +418,16 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>One item in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -435,9 +439,9 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>Zero items in resource06 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>PROPFIND</method>
<ruri>$rinboxpath6:/</ruri>
<header>
@@ -457,9 +461,9 @@
</verify>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource06 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath6:/</ruri>
<verify>
@@ -471,7 +475,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -479,6 +483,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath6:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath6:/</ruri>
<ruri>$rinboxpath6:/</ruri>
@@ -486,8 +494,8 @@
</test>
</test-suite>
- <test-suite name='#5 Mode accept-always: Non-recurring busy' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#5 Mode accept-always: Non-recurring busy'>
+ <test name='1'>
<description>Blocking event resource06</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -505,7 +513,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -519,16 +527,16 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>One item in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -540,9 +548,9 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>Zero items in resource06 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>PROPFIND</method>
<ruri>$rinboxpath6:/</ruri>
<header>
@@ -562,9 +570,9 @@
</verify>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource06 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath6:/</ruri>
<verify>
@@ -576,7 +584,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -584,6 +592,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath6:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath6:/</ruri>
<ruri>$rinboxpath6:/</ruri>
@@ -591,8 +603,8 @@
</test>
</test-suite>
- <test-suite name='#6 Mode accept-always: Recurring' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#6 Mode accept-always: Recurring'>
+ <test name='1'>
<description>Blocking event resource06</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -610,7 +622,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -624,16 +636,16 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>One item in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -645,9 +657,9 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>Zero items in resource06 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>PROPFIND</method>
<ruri>$rinboxpath6:/</ruri>
<header>
@@ -667,9 +679,9 @@
</verify>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource06 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath6:/</ruri>
<verify>
@@ -681,7 +693,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -689,6 +701,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath6:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath6:/</ruri>
<ruri>$rinboxpath6:/</ruri>
@@ -696,8 +712,8 @@
</test>
</test-suite>
- <test-suite name='#7 Mode decline-always: Non-recurring free' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#7 Mode decline-always: Non-recurring free'>
+ <test name='1'>
<description>Blocking event resource07</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -715,7 +731,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -729,16 +745,16 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>One item in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -750,9 +766,9 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>Zero items in resource07 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>PROPFIND</method>
<ruri>$rinboxpath7:/</ruri>
<header>
@@ -772,9 +788,9 @@
</verify>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource07 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath7:/</ruri>
<verify>
@@ -786,7 +802,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -794,6 +810,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath7:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath7:/</ruri>
<ruri>$rinboxpath7:/</ruri>
@@ -801,8 +821,8 @@
</test>
</test-suite>
- <test-suite name='#8 Mode decline-always Non-recurring busy' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#8 Mode decline-always Non-recurring busy'>
+ <test name='1'>
<description>Blocking event resource07</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -820,7 +840,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -834,16 +854,16 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>One item in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -855,9 +875,9 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>Zero items in resource06 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>PROPFIND</method>
<ruri>$rinboxpath6:/</ruri>
<header>
@@ -877,9 +897,9 @@
</verify>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource06 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath7:/</ruri>
<verify>
@@ -891,7 +911,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -899,6 +919,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath7:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath6:/</ruri>
<ruri>$rinboxpath6:/</ruri>
@@ -906,8 +930,8 @@
</test>
</test-suite>
- <test-suite name='#9 Mode decline-always Recurring' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#9 Mode decline-always Recurring'>
+ <test name='1'>
<description>Blocking event resource07</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -925,7 +949,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -939,16 +963,16 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>One item in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -960,11 +984,11 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
- <description>Zero items in resource06 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <test name='5'>
+ <description>Zero items in resource07 Inbox</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>PROPFIND</method>
- <ruri>$rinboxpath6:/</ruri>
+ <ruri>$rinboxpath7:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -982,9 +1006,9 @@
</verify>
</request>
</test>
- <test name='6' ignore='no'>
- <description>One item in resource06 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <test name='6'>
+ <description>One item in resource07 Calendar</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath7:/</ruri>
<verify>
@@ -996,7 +1020,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -1004,6 +1028,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath7:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath6:/</ruri>
<ruri>$rinboxpath6:/</ruri>
@@ -1011,8 +1039,8 @@
</test>
</test-suite>
- <test-suite name='#10 Mode accept-if-free: Non-recurring free' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#10 Mode accept-if-free: Non-recurring free'>
+ <test name='1'>
<description>Blocking event resource08</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -1030,7 +1058,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -1044,16 +1072,16 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>One item in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1065,9 +1093,9 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>Zero items in resource08 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>PROPFIND</method>
<ruri>$rinboxpath8:/</ruri>
<header>
@@ -1087,9 +1115,9 @@
</verify>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource08 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath8:/</ruri>
<verify>
@@ -1101,7 +1129,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -1109,6 +1137,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath8:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath8:/</ruri>
<ruri>$rinboxpath8:/</ruri>
@@ -1116,8 +1148,8 @@
</test>
</test-suite>
- <test-suite name='#11 Mode accept-if-free: Non-recurring busy' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#11 Mode accept-if-free: Non-recurring busy'>
+ <test name='1'>
<description>Blocking event resource08</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -1135,7 +1167,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -1149,9 +1181,9 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>Zero items in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>PROPFIND</method>
<ruri>$inboxpath1:/</ruri>
<header>
@@ -1171,9 +1203,9 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1185,16 +1217,16 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>One item in resource08 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>WAITDELETEALL 1</method>
<ruri>$rinboxpath8:/</ruri>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource08 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath8:/</ruri>
<verify>
@@ -1206,7 +1238,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -1214,6 +1246,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath8:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath8:/</ruri>
<ruri>$rinboxpath8:/</ruri>
@@ -1221,8 +1257,8 @@
</test>
</test-suite>
- <test-suite name='#12 Mode accept-if-free: Recurring' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#12 Mode accept-if-free: Recurring'>
+ <test name='1'>
<description>Blocking event resource08</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -1240,7 +1276,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -1254,16 +1290,16 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>One item in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1275,16 +1311,16 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>One item in resource08 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>WAITDELETEALL 1</method>
<ruri>$rinboxpath8:/</ruri>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource08 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath8:/</ruri>
<verify>
@@ -1296,7 +1332,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -1304,6 +1340,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath8:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath8:/</ruri>
<ruri>$rinboxpath8:/</ruri>
@@ -1311,8 +1351,8 @@
</test>
</test-suite>
- <test-suite name='#13 Mode decline-if-busy: Non-recurring free' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#13 Mode decline-if-busy: Non-recurring free'>
+ <test name='1'>
<description>Blocking event resource09</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -1330,7 +1370,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -1344,9 +1384,9 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>Zero items in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>PROPFIND</method>
<ruri>$inboxpath1:/</ruri>
<header>
@@ -1366,9 +1406,9 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1380,16 +1420,16 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>One item in resource09 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>WAITDELETEALL 1</method>
<ruri>$rinboxpath9:/</ruri>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource09 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath9:/</ruri>
<verify>
@@ -1401,7 +1441,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -1409,6 +1449,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath9:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath9:/</ruri>
<ruri>$rinboxpath9:/</ruri>
@@ -1416,8 +1460,8 @@
</test>
</test-suite>
- <test-suite name='#14 Mode decline-if-busy: Non-recurring busy' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#14 Mode decline-if-busy: Non-recurring busy'>
+ <test name='1'>
<description>Blocking event resource09</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -1435,7 +1479,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -1449,16 +1493,16 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>One item in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1470,9 +1514,9 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>No items in resource09 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>PROPFIND</method>
<ruri>$rinboxpath9:/</ruri>
<header>
@@ -1492,9 +1536,9 @@
</verify>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource09 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath9:/</ruri>
<verify>
@@ -1506,7 +1550,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -1514,6 +1558,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath9:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath9:/</ruri>
<ruri>$rinboxpath9:/</ruri>
@@ -1521,8 +1569,8 @@
</test>
</test-suite>
- <test-suite name='#15 Mode decline-if-busy: Recurring' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#15 Mode decline-if-busy: Recurring'>
+ <test name='1'>
<description>Blocking event resource09</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -1540,7 +1588,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -1554,16 +1602,16 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>One item in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1575,9 +1623,9 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>No items in resource09 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>PROPFIND</method>
<ruri>$rinboxpath9:/</ruri>
<header>
@@ -1597,9 +1645,9 @@
</verify>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource09 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath9:/</ruri>
<verify>
@@ -1611,7 +1659,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -1619,6 +1667,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath9:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath9:/</ruri>
<ruri>$rinboxpath9:/</ruri>
@@ -1626,8 +1678,8 @@
</test>
</test-suite>
- <test-suite name='#16 Mode automatic: Non-recurring free' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#16 Mode automatic: Non-recurring free'>
+ <test name='1'>
<description>Blocking event resource10</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -1645,7 +1697,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -1659,16 +1711,16 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>One item in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1680,9 +1732,9 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>Zero items in resource10 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>PROPFIND</method>
<ruri>$rinboxpath10:/</ruri>
<header>
@@ -1702,9 +1754,9 @@
</verify>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource10 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath10:/</ruri>
<verify>
@@ -1716,7 +1768,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -1724,6 +1776,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath10:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath10:/</ruri>
<ruri>$rinboxpath10:/</ruri>
@@ -1731,8 +1787,8 @@
</test>
</test-suite>
- <test-suite name='#17 Mode automatic: Non-recurring busy' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#17 Mode automatic: Non-recurring busy'>
+ <test name='1'>
<description>Blocking event resource10</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -1750,7 +1806,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -1764,16 +1820,16 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>One item in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1785,9 +1841,9 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>Zero items in resource10 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>PROPFIND</method>
<ruri>$rinboxpath10:/</ruri>
<header>
@@ -1807,9 +1863,9 @@
</verify>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource10 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath10:/</ruri>
<verify>
@@ -1821,7 +1877,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -1829,6 +1885,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath10:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath10:/</ruri>
<ruri>$rinboxpath10:/</ruri>
@@ -1836,8 +1896,8 @@
</test>
</test-suite>
- <test-suite name='#18 Mode automatic: Recurring' ignore='no'>
- <test name='1' ignore='no'>
+ <test-suite name='#18 Mode automatic: Recurring'>
+ <test name='1'>
<description>Blocking event resource10</description>
<request user="$useradmin:" pswd="$pswdadmin:" end-delete="yes">
<method>PUT</method>
@@ -1855,7 +1915,7 @@
<ruri>1</ruri>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='2'>
<description>Create new event</description>
<request>
<method>PUT</method>
@@ -1869,16 +1929,16 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
+ <test name='3'>
<description>One item in user01 Inbox</description>
- <request print-response="no">
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4'>
<description>One item in user01 Calendar</description>
- <request print-response="no">
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1890,9 +1950,9 @@
</verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='5'>
<description>Zero items in resource10 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>PROPFIND</method>
<ruri>$rinboxpath10:/</ruri>
<header>
@@ -1912,9 +1972,9 @@
</verify>
</request>
</test>
- <test name='6' ignore='no'>
+ <test name='6'>
<description>One item in resource10 Calendar</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath10:/</ruri>
<verify>
@@ -1926,7 +1986,7 @@
</verify>
</request>
</test>
- <test name='7' ignore='no'>
+ <test name='-1'>
<description>Clean-up</description>
<request>
<method>DELETEALL</method>
@@ -1934,6 +1994,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$rcalendarpath10:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath10:/</ruri>
<ruri>$rinboxpath10:/</ruri>
@@ -1947,11 +2011,6 @@
<ruri>$inboxpath1:/</ruri>
<ruri>$calendarpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- <ruri>$calendarpath2:/</ruri>
- </request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rcalendarpath5:/</ruri>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -204,6 +204,7 @@
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$rinboxpath1:/</ruri>
+ <ruri>$rinboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -212,26 +213,21 @@
<request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
- </request>
- <request>
- <method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
+ <method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$useradmin:" pswd="$pswdadmin:">
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
+ <ruri>$inboxpath2:/</ruri>
<ruri>$calendarpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
+ <method>WAITCOUNT 0</method>
<ruri>$rcalendarpath1:/</ruri>
+ <ruri>$rcalendarpath2:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -426,13 +426,16 @@
<ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 3</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
<ruri>$calendarpath2:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rinboxpath1:/</ruri>
+ <method>WAITCOUNT 0</method>
<ruri>$rcalendarpath1:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitbadclients.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitbadclients.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitbadclients.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -148,17 +148,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
@@ -275,17 +273,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitbatchrefresh.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitbatchrefresh.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitbatchrefresh.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -765,19 +765,25 @@
<end>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
+ <ruri>$inboxpath2:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
+ <ruri>$inboxpath4:/</ruri>
+ <ruri>$inboxpath5:/</ruri>
+ <ruri>$inboxpath6:/</ruri>
+ <ruri>$inboxpath7:/</ruri>
+ <ruri>$inboxpath8:/</ruri>
+ <ruri>$inboxpath9:/</ruri>
+ <ruri>$inboxpath10:/</ruri>
+ <ruri>$inboxpath11:/</ruri>
+ <ruri>$inboxpath12:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$calendarpath3:/</ruri>
- <ruri>$calendarpath4:/</ruri>
- <ruri>$calendarpath5:/</ruri>
- <ruri>$calendarpath6:/</ruri>
- <ruri>$calendarpath7:/</ruri>
- <ruri>$calendarpath8:/</ruri>
- <ruri>$calendarpath9:/</ruri>
- <ruri>$calendarpath10:/</ruri>
- <ruri>$calendarpath11:/</ruri>
- <ruri>$calendarpath12:/</ruri>
<ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITDELETEALL 3</method>
<ruri>$inboxpath2:/</ruri>
<ruri>$inboxpath3:/</ruri>
<ruri>$inboxpath4:/</ruri>
@@ -790,6 +796,20 @@
<ruri>$inboxpath11:/</ruri>
<ruri>$inboxpath12:/</ruri>
</request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ <ruri>$calendarpath3:/</ruri>
+ <ruri>$calendarpath4:/</ruri>
+ <ruri>$calendarpath5:/</ruri>
+ <ruri>$calendarpath6:/</ruri>
+ <ruri>$calendarpath7:/</ruri>
+ <ruri>$calendarpath8:/</ruri>
+ <ruri>$calendarpath9:/</ruri>
+ <ruri>$calendarpath10:/</ruri>
+ <ruri>$calendarpath11:/</ruri>
+ <ruri>$calendarpath12:/</ruri>
+ </request>
</end>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -40,7 +40,7 @@
<test-suite name='Non-recurring - DELETE'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -51,27 +51,35 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Organizer deletes event</description>
- <request print-response='no'>
+ <request>
<method>DELETE</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='3'>
<description>Attendee stores cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -85,7 +93,7 @@
</test>
<test name='4'>
<description>Attendee deletes cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$</ruri>
<verify>
@@ -115,22 +123,16 @@
</verify>
</request>
</test>
- <test name='6'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
@@ -139,7 +141,7 @@
<test-suite name='Recurring - DELETE - all'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -150,27 +152,35 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Organizer deletes event</description>
- <request print-response='no'>
+ <request>
<method>DELETE</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='3'>
<description>Attendee stores cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -184,7 +194,7 @@
</test>
<test name='4'>
<description>Attendee deletes cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$</ruri>
<verify>
@@ -214,22 +224,16 @@
</verify>
</request>
</test>
- <test name='6'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
@@ -238,7 +242,7 @@
<test-suite name='Recurring - DELETE - some'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -249,10 +253,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Organizer updates event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -263,10 +271,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 2</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='3'>
<description>Attendee stores cancelled event instances</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -276,7 +288,7 @@
</test>
<test name='4'>
<description>Attendee stores cancelled event instances</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -310,23 +322,20 @@
</verify>
</request>
</test>
- <test name='6'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -334,7 +343,7 @@
<test-suite name='Partial - DELETE - all'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -345,27 +354,35 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Organizer deletes event</description>
- <request print-response='no'>
+ <request>
<method>DELETE</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='3'>
<description>Attendee stores cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -379,7 +396,7 @@
</test>
<test name='4'>
<description>Attendee deletes cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$</ruri>
<verify>
@@ -409,22 +426,16 @@
</verify>
</request>
</test>
- <test name='6'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
@@ -433,7 +444,7 @@
<test-suite name='Partial - DELETE - some'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -444,10 +455,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Organizer updates event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -458,10 +473,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 2</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='3'>
<description>Attendee stores cancelled event instances</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -471,7 +490,7 @@
</test>
<test name='4'>
<description>Attendee stores cancelled event instances</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -505,23 +524,20 @@
</verify>
</request>
</test>
- <test name='6'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -529,7 +545,7 @@
<test-suite name='Non-recurring - remove'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -540,10 +556,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Organizer updates event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -554,17 +574,21 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='3'>
<description>Attendee stores cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -578,7 +602,7 @@
</test>
<test name='4'>
<description>Attendee deletes cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$</ruri>
<verify>
@@ -608,22 +632,16 @@
</verify>
</request>
</test>
- <test name='6'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
@@ -632,7 +650,7 @@
<test-suite name='Recurring - remove - all'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -643,10 +661,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Organizer updates event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -657,17 +679,21 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='3'>
<description>Attendee stores cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -681,7 +707,7 @@
</test>
<test name='4'>
<description>Attendee deletes cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$</ruri>
<verify>
@@ -711,22 +737,16 @@
</verify>
</request>
</test>
- <test name='6'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
@@ -735,7 +755,7 @@
<test-suite name='Recurring - remove - some'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -746,10 +766,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Organizer updates event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -760,10 +784,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 2</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='3'>
<description>Attendee stores cancelled event instances</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -773,7 +801,7 @@
</test>
<test name='4'>
<description>Attendee stores cancelled event instances</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -807,23 +835,20 @@
</verify>
</request>
</test>
- <test name='6'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -831,7 +856,7 @@
<test-suite name='Recurring - remove - twice'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -842,10 +867,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -859,7 +888,7 @@
</test>
<test name='3'>
<description>Organizer cancelled one instance</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -870,10 +899,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 2</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -887,7 +920,7 @@
</test>
<test name='5'>
<description>Organizer cancelled another instance</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -898,10 +931,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 2</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='6'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -913,23 +950,20 @@
</verify>
</request>
</test>
- <test name='7'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -937,7 +971,7 @@
<test-suite name='Partial - remove - all'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -948,10 +982,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Organizer updates event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -962,17 +1000,21 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='3'>
<description>Attendee stores cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -986,7 +1028,7 @@
</test>
<test name='4'>
<description>Attendee deletes cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$</ruri>
<verify>
@@ -1016,22 +1058,16 @@
</verify>
</request>
</test>
- <test name='6'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
@@ -1040,7 +1076,7 @@
<test-suite name='Partial - remove - some'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1051,10 +1087,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Organizer updates event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1065,17 +1105,21 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='3'>
<description>Attendee stores cancelled event instances</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1089,14 +1133,14 @@
</test>
<test name='4'>
<description>Attendee removes cancelled event instances</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1108,23 +1152,20 @@
</verify>
</request>
</test>
- <test name='5'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -1132,7 +1173,7 @@
<test-suite name='Recurring - remove - some - attendee still cancelled'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1143,10 +1184,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Organizer updates event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1157,17 +1202,21 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 2</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='3'>
<description>Attendee stores cancelled event instances</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1181,21 +1230,21 @@
</test>
<test name='4'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='5'>
<description>Attendee declines an instance</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1209,28 +1258,25 @@
</test>
<test name='6'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='7'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -1238,7 +1284,7 @@
<test-suite name='Override - remove - some'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1252,11 +1298,11 @@
</test>
<test name='2'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$inboxpath2:/</ruri>
<verify>
@@ -1267,14 +1313,14 @@
</arg>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Organizer updates event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<header> <!-- This tests needs to trigger a smart merge -->
@@ -1292,11 +1338,11 @@
</test>
<test name='5'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$inboxpath2:/</ruri>
<verify>
@@ -1307,27 +1353,21 @@
</arg>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
- <test name='7'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
@@ -1336,7 +1376,7 @@
<test-suite name='Non-recurring with time-shift - remove'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1349,29 +1389,19 @@
</request>
</test>
<test name='2'>
- <description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <description>Attendee Inbox Items</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
</test>
<test name='3'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1385,7 +1415,7 @@
</test>
<test name='4'>
<description>Organizer removes attendee and changes time</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1398,29 +1428,19 @@
</request>
</test>
<test name='5'>
- <description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <description>Attendee Inbox Items</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
</test>
<test name='6'>
<description>Attendee has cancelled data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1445,9 +1465,12 @@
<ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
- <ruri>$inboxpath3:/</ruri>
</request>
</test>
</test-suite>
@@ -1455,7 +1478,7 @@
<test-suite name='Recurring with time-shift - remove'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1468,29 +1491,19 @@
</request>
</test>
<test name='2'>
- <description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <description>Attendee Inbox Items</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
</test>
<test name='3'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1504,7 +1517,7 @@
</test>
<test name='4'>
<description>Organizer removes attendee and changes time</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1517,29 +1530,19 @@
</request>
</test>
<test name='5'>
- <description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <description>Attendee Inbox Items</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
</test>
<test name='6'>
<description>Attendee has cancelled data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1553,7 +1556,7 @@
</test>
<test name='7'>
<description>Attendee has valid data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -1578,9 +1581,12 @@
<ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
- <ruri>$inboxpath3:/</ruri>
</request>
</test>
</test-suite>
@@ -1588,7 +1594,7 @@
<test-suite name='Recurring (override) with time-shift - remove'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1601,29 +1607,19 @@
</request>
</test>
<test name='2'>
- <description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <description>Attendee Inbox Items</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
</test>
<test name='3'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1637,7 +1633,7 @@
</test>
<test name='4'>
<description>Organizer removes attendee and changes time</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1650,29 +1646,19 @@
</request>
</test>
<test name='5'>
- <description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <description>Attendee Inbox Items</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
</test>
<test name='6'>
<description>Attendee has cancelled data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1686,7 +1672,7 @@
</test>
<test name='7'>
<description>Attendee has valid data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -1711,9 +1697,12 @@
<ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
- <ruri>$inboxpath3:/</ruri>
</request>
</test>
</test-suite>
@@ -1721,7 +1710,7 @@
<test-suite name='Recurring (override) with time-shift - removed from master only'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1734,29 +1723,19 @@
</request>
</test>
<test name='2'>
- <description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <description>Attendee Inbox Items</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
</test>
<test name='3'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1770,7 +1749,7 @@
</test>
<test name='4'>
<description>Organizer removes attendee and changes time</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1783,22 +1762,19 @@
</request>
</test>
<test name='5'>
- <description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 2</method>
+ <description>Attendee Inbox Items</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 2</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='6'>
<description>Attendee has cancelled data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1812,7 +1788,7 @@
</test>
<test name='7'>
<description>Attendee has valid data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -1832,14 +1808,20 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
- <ruri>$inboxpath3:/</ruri>
</request>
</test>
</test-suite>
@@ -1847,7 +1829,7 @@
<test-suite name='Non-recurring - remove'>
<test name='1'>
<description>Organizer stores event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1858,10 +1840,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Organizer updates event</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1872,17 +1858,21 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='3'>
<description>Attendee stores cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1896,7 +1886,7 @@
</test>
<test name='4'>
<description>Attendee deletes cancelled event</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$</ruri>
<verify>
@@ -1926,22 +1916,16 @@
</verify>
</request>
</test>
- <test name='6'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
@@ -2078,6 +2062,10 @@
</arg>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ </request>
</test>
<test name='11'>
<description>Attendee has data</description>
@@ -2244,6 +2232,10 @@
</arg>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='11'>
<description>Attendee has data</description>
@@ -2405,6 +2397,10 @@
</arg>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ </request>
</test>
<test name='11'>
<description>Attendee has data</description>
@@ -2428,9 +2424,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -2571,6 +2570,10 @@
</arg>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='11'>
<description>Attendee has data</description>
@@ -2594,9 +2597,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitcompatibility.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitcompatibility.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitcompatibility.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -196,17 +196,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL </method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
@@ -327,18 +325,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -458,32 +453,19 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
- <end>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
- <ruri>$inboxpath1:/</ruri>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
- <ruri>$calendarpath3:/</ruri>
- <ruri>$inboxpath3:/</ruri>
- </request>
- </end>
+ <end/>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitdropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitdropbox.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitdropbox.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -36,16 +36,6 @@
<method>GET</method>
<ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
- </request>
</start>
<test-suite name='Simple dropbox' ignore='no'>
@@ -279,18 +269,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -441,22 +428,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELAY</method>
- <ruri>2</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/impliciterrors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/impliciterrors.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/impliciterrors.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -28,7 +28,7 @@
<start/>
- <test-suite name='Allowed Organizers' ignore='no'>
+ <test-suite name='Allowed Organizers'>
<test name='1'>
<description>Organizer (resource) invites Attendee</description>
<request print-response='no'>
@@ -49,7 +49,7 @@
</test>
</test-suite>
- <test-suite name='Canonical paths' ignore='no'>
+ <test-suite name='Canonical paths'>
<test name='1'>
<description>Organizer creates event without Attendee</description>
<request print-response='no'>
@@ -77,29 +77,30 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='3'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Two EXDATEs' ignore='no'>
+ <test-suite name='Two EXDATEs'>
<test name='1'>
<description>Organizer creates recurring event with Attendee</description>
<request print-response='no'>
@@ -232,23 +233,20 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Bad content-type on Inbox' ignore='no'>
+ <test-suite name='Bad content-type on Inbox'>
<test name='1'>
<description>Organizer creates event with Attendee</description>
<request print-response='no'>
@@ -320,24 +318,9 @@
</test>
<test name='5'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>PROPFIND</method>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <data>
- <content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/implicit/1.xml</filepath>
- </data>
- <verify>
- <callback>multistatusItems</callback>
- <arg>
- <name>count</name>
- <value>1</value>
- </arg>
- </verify>
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
@@ -365,29 +348,27 @@
</arg>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='9'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Invalid Attendee PUT using Organizer on server' ignore='no'>
+ <test-suite name='Invalid Attendee PUT using Organizer on server'>
<test name='1'>
<description>Attendee creates event</description>
<request print-response='no'>
@@ -422,7 +403,7 @@
</test>
</test-suite>
- <test-suite name='Recurrence expand with expand EXDATE' ignore='no'>
+ <test-suite name='Recurrence expand with expand EXDATE'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -526,23 +507,20 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Invalid Organizer PUT of orphaned instance' ignore='no'>
+ <test-suite name='Invalid Organizer PUT of orphaned instance'>
<test name='1'>
<description>Organizer creates event</description>
<request print-response='no'>
@@ -577,7 +555,7 @@
</test>
</test-suite>
- <test-suite name='Invalid Attendee PUT of missing cancelled instance' ignore='no'>
+ <test-suite name='Invalid Attendee PUT of missing cancelled instance'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -723,7 +701,7 @@
</test>
</test-suite>
- <test-suite name='Invalid Attendee PUT without own ATTENDEE property' ignore='no'>
+ <test-suite name='Invalid Attendee PUT without own ATTENDEE property'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -806,9 +784,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -945,7 +926,7 @@
</test>
</test-suite>
- <test-suite name='Organizer PUT remove recurrence and master override' ignore='no'>
+ <test-suite name='Organizer PUT remove recurrence and master override'>
<test name='1'>
<description>Organizer invites Attendee - recurring with master override</description>
<request print-response='no'>
@@ -959,6 +940,10 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Organizer checks data</description>
@@ -987,6 +972,10 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='4'>
<description>Organizer checks data</description>
@@ -1024,9 +1013,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -47,10 +47,10 @@
</request>
</start>
- <test-suite name='Organizer invites Attendee and checks free busy' ignore='no'>
+ <test-suite name='Organizer invites Attendee and checks free busy'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -64,7 +64,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -78,14 +78,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -99,7 +99,7 @@
</test>
<test name='6'>
<description>Attendee free</description>
- <request print-response='no'>
+ <request>
<method>POST</method>
<ruri>$outboxpath1:/</ruri>
<data>
@@ -131,14 +131,14 @@
</test>
<test name='7'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -152,14 +152,14 @@
</test>
<test name='8'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='10'>
<description>Attendee busy</description>
- <request print-response='no'>
+ <request>
<method>POST</method>
<ruri>$outboxpath1:/</ruri>
<data>
@@ -192,14 +192,14 @@
</test>
<test name='11'>
<description>Attendee -> EXDATE one instance</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -213,14 +213,14 @@
</test>
<test name='12'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='14'>
<description>Attendee free</description>
- <request print-response='no'>
+ <request>
<method>POST</method>
<ruri>$outboxpath1:/</ruri>
<data>
@@ -258,17 +258,20 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Organizer invites auto-accept Attendee and checks free busy' ignore='no'>
+ <test-suite name='Organizer invites auto-accept Attendee and checks free busy'>
<test name='1'>
<description>Organizer invites Resource</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -280,13 +283,13 @@
</verify>
</request>
<request>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -300,7 +303,7 @@
</test>
<test name='3'>
<description>Resource has data</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response='no'>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>GETNEW</method>
<ruri>$rcalendarpath1:/</ruri>
<verify>
@@ -310,11 +313,12 @@
<value>Resource/CalDAV/implicit/freebusy/autocancel/3.ics</value>
</arg>
</verify>
+ <graburi>$rresource:</graburi>
</request>
</test>
<test name='4'>
<description>Resource busy</description>
- <request print-response='no'>
+ <request>
<method>POST</method>
<ruri>$outboxpath1:/</ruri>
<data>
@@ -347,7 +351,7 @@
</test>
<test name='5'>
<description>Organizer cancels one instance</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -361,7 +365,7 @@
</test>
<test name='6'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -375,9 +379,9 @@
</test>
<test name='7'>
<description>Resource has data</description>
- <request user="$useradmin:" pswd="$pswdadmin:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$rcalendarpath1:/</ruri>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>GETCHANGED</method>
+ <ruri>$rresource:</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -389,7 +393,7 @@
</test>
<test name='8'>
<description>Attendee free</description>
- <request print-response='no'>
+ <request>
<method>POST</method>
<ruri>$outboxpath1:/</ruri>
<data>
@@ -425,10 +429,9 @@
<ruri>$calendarpath1:/</ruri>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 0</method>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitlarge.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitlarge.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitlarge.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -230,14 +230,52 @@
<request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
- </request>
- <request>
- <method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
+ <ruri>$inboxpath4:/</ruri>
+ <ruri>$inboxpath5:/</ruri>
+ <ruri>$inboxpath6:/</ruri>
+ <ruri>$inboxpath7:/</ruri>
+ <ruri>$inboxpath8:/</ruri>
+ <ruri>$inboxpath9:/</ruri>
+ <ruri>$inboxpath10:/</ruri>
+ <ruri>$inboxpath11:/</ruri>
+ <ruri>$inboxpath12:/</ruri>
+ <ruri>$inboxpath13:/</ruri>
+ <ruri>$inboxpath14:/</ruri>
+ <ruri>$inboxpath15:/</ruri>
+ <ruri>$inboxpath16:/</ruri>
+ <ruri>$inboxpath17:/</ruri>
+ <ruri>$inboxpath18:/</ruri>
+ <ruri>$inboxpath19:/</ruri>
+ <ruri>$inboxpath20:/</ruri>
+ <ruri>$inboxpath21:/</ruri>
+ <ruri>$inboxpath22:/</ruri>
+ <ruri>$inboxpath23:/</ruri>
+ <ruri>$inboxpath24:/</ruri>
+ <ruri>$inboxpath25:/</ruri>
+ <ruri>$inboxpath26:/</ruri>
+ <ruri>$inboxpath27:/</ruri>
+ <ruri>$inboxpath28:/</ruri>
+ <ruri>$inboxpath29:/</ruri>
+ <ruri>$inboxpath30:/</ruri>
+ <ruri>$inboxpath31:/</ruri>
+ <ruri>$inboxpath32:/</ruri>
+ <ruri>$inboxpath33:/</ruri>
+ <ruri>$inboxpath34:/</ruri>
+ <ruri>$inboxpath35:/</ruri>
+ <ruri>$inboxpath36:/</ruri>
+ <ruri>$inboxpath37:/</ruri>
+ <ruri>$inboxpath38:/</ruri>
+ <ruri>$inboxpath39:/</ruri>
+ <ruri>$inboxpath40:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
<ruri>$calendarpath2:/</ruri>
<ruri>$calendarpath3:/</ruri>
<ruri>$calendarpath4:/</ruri>
@@ -277,46 +315,6 @@
<ruri>$calendarpath38:/</ruri>
<ruri>$calendarpath39:/</ruri>
<ruri>$calendarpath40:/</ruri>
- <ruri>$inboxpath1:/</ruri>
- <ruri>$inboxpath2:/</ruri>
- <ruri>$inboxpath3:/</ruri>
- <ruri>$inboxpath4:/</ruri>
- <ruri>$inboxpath5:/</ruri>
- <ruri>$inboxpath6:/</ruri>
- <ruri>$inboxpath7:/</ruri>
- <ruri>$inboxpath8:/</ruri>
- <ruri>$inboxpath9:/</ruri>
- <ruri>$inboxpath10:/</ruri>
- <ruri>$inboxpath11:/</ruri>
- <ruri>$inboxpath12:/</ruri>
- <ruri>$inboxpath13:/</ruri>
- <ruri>$inboxpath14:/</ruri>
- <ruri>$inboxpath15:/</ruri>
- <ruri>$inboxpath16:/</ruri>
- <ruri>$inboxpath17:/</ruri>
- <ruri>$inboxpath18:/</ruri>
- <ruri>$inboxpath19:/</ruri>
- <ruri>$inboxpath20:/</ruri>
- <ruri>$inboxpath21:/</ruri>
- <ruri>$inboxpath22:/</ruri>
- <ruri>$inboxpath23:/</ruri>
- <ruri>$inboxpath24:/</ruri>
- <ruri>$inboxpath25:/</ruri>
- <ruri>$inboxpath26:/</ruri>
- <ruri>$inboxpath27:/</ruri>
- <ruri>$inboxpath28:/</ruri>
- <ruri>$inboxpath29:/</ruri>
- <ruri>$inboxpath30:/</ruri>
- <ruri>$inboxpath31:/</ruri>
- <ruri>$inboxpath32:/</ruri>
- <ruri>$inboxpath33:/</ruri>
- <ruri>$inboxpath34:/</ruri>
- <ruri>$inboxpath35:/</ruri>
- <ruri>$inboxpath36:/</ruri>
- <ruri>$inboxpath37:/</ruri>
- <ruri>$inboxpath38:/</ruri>
- <ruri>$inboxpath39:/</ruri>
- <ruri>$inboxpath40:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstatchange.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstatchange.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstatchange.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -39,27 +39,12 @@
<method>GET</method>
<ruri>$calendarpath3:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$calendarpath3:/</ruri>
- <ruri>$inboxpath3:/</ruri>
- </request>
</start>
<test-suite name='Simple Changes' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee with PARTSTAT=ACCEPTED</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -73,7 +58,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -87,14 +72,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -108,7 +93,7 @@
</test>
<test name='5'>
<description>Organizer re-invites Attendee with PARTSTAT=ACCEPTED and adds another attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -122,7 +107,7 @@
</test>
<test name='6'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -136,14 +121,14 @@
</test>
<test name='7'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='8'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -157,14 +142,14 @@
</test>
<test name='9'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -178,14 +163,14 @@
</test>
<test name='10'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='11'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -199,7 +184,7 @@
</test>
<test name='12'>
<description>Organizer changes Summary - PARTSTAT=DECLINED</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -213,7 +198,7 @@
</test>
<test name='13'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -227,14 +212,14 @@
</test>
<test name='14'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='15'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -248,7 +233,7 @@
</test>
<test name='16'>
<description>Organizer changes Summary - PARTSTAT=NEEDS-ACTION</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -262,7 +247,7 @@
</test>
<test name='17'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -276,14 +261,14 @@
</test>
<test name='18'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='19'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -297,33 +282,25 @@
</test>
<test name='20'>
<description>Clean-up</description>
- <request user="$userid1:" pswd="$pswd1:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$calendarpath3:/</ruri>
- </request>
<request user="$userid1:" pswd="$pswd1:">
- <method>DELAY</method>
- <ruri>2</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
+ <ruri>$calendarpath3:/</ruri>
</request>
</test>
</test-suite>
@@ -331,7 +308,7 @@
<test-suite name='Recurrence' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee with PARTSTAT=ACCEPTED recurring</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -345,7 +322,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -359,14 +336,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -380,7 +357,7 @@
</test>
<test name='5'>
<description>Organizer overrides instance with Attendee with PARTSTAT=ACCEPTED</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -394,7 +371,7 @@
</test>
<test name='6'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -408,14 +385,14 @@
</test>
<test name='7'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='8'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -429,14 +406,14 @@
</test>
<test name='9'>
<description>Attendee -> Accepted on master, Declined on instance</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -450,14 +427,14 @@
</test>
<test name='10'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='11'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -471,7 +448,7 @@
</test>
<test name='12'>
<description>Organizer removes override without cancel</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -485,7 +462,7 @@
</test>
<test name='13'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -506,7 +483,7 @@
</test>
<test name='15'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -520,7 +497,7 @@
</test>
<test name='16'>
<description>Organizer removes override with cancel</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -534,7 +511,7 @@
</test>
<test name='17'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -555,7 +532,7 @@
</test>
<test name='19'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -572,37 +549,23 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$calendarpath3:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELAY</method>
- <ruri>2</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- </request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
- </request>
</test>
</test-suite>
<test-suite name='Organizer Change without prior refresh with Schedule-Tag'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/6.ics</ruri>
<data>
@@ -616,7 +579,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/6.ics</ruri>
<verify>
@@ -634,14 +597,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -655,14 +618,14 @@
</test>
<test name='6'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -676,14 +639,14 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/6.ics</ruri>
<verify>
@@ -697,14 +660,14 @@
</test>
<test name='10'>
<description>Attendee -> Declines an instance</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -718,14 +681,14 @@
</test>
<test name='11'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='12'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/6.ics</ruri>
<verify>
@@ -739,7 +702,7 @@
</test>
<test name='14'>
<description>Organizer changes old data with valid Schedule-Tag match</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/6.ics</ruri>
<header>
@@ -761,7 +724,7 @@
</test>
<test name='15'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/6.ics</ruri>
<verify>
@@ -779,14 +742,14 @@
</test>
<test name='16'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='17'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -806,9 +769,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstattimestamp.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstattimestamp.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstattimestamp.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -36,16 +36,6 @@
<method>GET</method>
<ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
- </request>
</start>
<test-suite name='OPTIONS header' ignore='no'>
@@ -312,22 +302,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELAY</method>
- <ruri>2</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitprivateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitprivateevents.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitprivateevents.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -199,18 +199,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitproxy.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitproxy.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -379,19 +379,17 @@
</test-suite>
<end>
- <request>
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- <ruri>$calendarpath:/</ruri>
- </request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
<ruri>$calendarpath2:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
</request>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitpublicproperties.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitpublicproperties.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitpublicproperties.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -40,7 +40,7 @@
<test-suite name='Simple Event' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -54,7 +54,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -68,14 +68,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -89,14 +89,14 @@
</test>
<test name='5'>
<description>Attendee -> Accepted with removal of property</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -110,7 +110,7 @@
</test>
<test name='6'>
<description>Attendee has data with X- restored</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -124,14 +124,14 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -148,18 +148,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur1.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur1.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -283,32 +283,21 @@
</verify>
</request>
</test>
- <test name='21'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$calendarpath3:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
- </request>
</test>
</test-suite>
@@ -408,6 +397,10 @@
</arg>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>WAITCOUNT 1</method>
<ruri>$inboxpath3:/</ruri>
@@ -423,6 +416,10 @@
</arg>
</verify>
</request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>DELETEALL</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
</test>
<test name='8'>
<description>Attendees have cancelled data</description>
@@ -449,32 +446,21 @@
</verify>
</request>
</test>
- <test name='9'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
- </request>
</test>
</test-suite>
@@ -570,23 +556,20 @@
</verify>
</request>
</test>
- <test name='10'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -690,23 +673,20 @@
</verify>
</request>
</test>
- <test name='11'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -845,23 +825,20 @@
</verify>
</request>
</test>
- <test name='14'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -1015,23 +992,20 @@
</verify>
</request>
</test>
- <test name='15'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -1185,23 +1159,20 @@
</verify>
</request>
</test>
- <test name='15'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur2.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur2.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur2.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -44,7 +44,7 @@
<test-suite name='Initial event' ignore='no'>
<test name='1'>
<description>Organizer invites one Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -58,7 +58,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -72,14 +72,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Items</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -94,7 +94,7 @@
</test>
<test name='6'>
<description>Attendee 1 -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$event2:</ruri>
<data>
@@ -108,14 +108,14 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -132,7 +132,7 @@
<test-suite name='Organizer invites other Attendee to one instance only' ignore='no'>
<test name='1'>
<description>Organizer invites one Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -146,7 +146,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -160,14 +160,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Items</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -182,14 +182,14 @@
</test>
<test name='6'>
<description>Attendee 2 Inbox Items</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='7'>
<description>Attendee 2 has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -204,7 +204,7 @@
</test>
<test name='9'>
<description>Attendee 2 -> Accepted</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$event3:</ruri>
<data>
@@ -218,14 +218,14 @@
</test>
<test name='10'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='11'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -242,7 +242,7 @@
<test-suite name='Organizer truncate' ignore='no'>
<test name='1'>
<description>Organizer truncates and removes instance for Attendee 2</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -256,7 +256,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -270,14 +270,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Items</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -292,14 +292,14 @@
</test>
<test name='6'>
<description>Attendee 2 Inbox Items</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='7'>
<description>Attendee 3 has cancelled data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -314,7 +314,7 @@
</test>
<test name='9'>
<description>Attendee 3 removes data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETE</method>
<ruri>$event3:</ruri>
<verify>
@@ -327,7 +327,7 @@
<test-suite name='Organizer override remove'>
<test name='1'>
<description>Organizer invites Attendee 2 with override</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/2.ics</ruri>
<data>
@@ -341,7 +341,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/2.ics</ruri>
<verify>
@@ -355,14 +355,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Items</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -377,7 +377,7 @@
</test>
<test name='5'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$event2:</ruri>
<data>
@@ -391,14 +391,14 @@
</test>
<test name='6'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='7'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/2.ics</ruri>
<verify>
@@ -412,7 +412,7 @@
</test>
<test name='8'>
<description>Organizer removes override</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/2.ics</ruri>
<data>
@@ -426,7 +426,7 @@
</test>
<test name='9'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/2.ics</ruri>
<verify>
@@ -440,14 +440,14 @@
</test>
<test name='10'>
<description>Attendee Inbox Items</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='11'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$event2:</ruri>
<verify>
@@ -464,7 +464,7 @@
<test-suite name='Attendee decline instance, then organizer cancel'>
<test name='1'>
<description>Organizer invites Attendee 2 with override</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/3.ics</ruri>
<data>
@@ -478,7 +478,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/3.ics</ruri>
<verify>
@@ -492,14 +492,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Items</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -514,7 +514,7 @@
</test>
<test name='5'>
<description>Attendee -> Accepted/Removed</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$event2:</ruri>
<data>
@@ -525,7 +525,7 @@
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$event2:</ruri>
<verify>
@@ -539,14 +539,14 @@
</test>
<test name='6'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='7'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/3.ics</ruri>
<verify>
@@ -560,7 +560,7 @@
</test>
<test name='8'>
<description>Organizer removes override</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/3.ics</ruri>
<data>
@@ -574,7 +574,7 @@
</test>
<test name='9'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/3.ics</ruri>
<verify>
@@ -588,14 +588,14 @@
</test>
<test name='10'>
<description>Attendee Inbox Items</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 2</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='11'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$event2:</ruri>
<verify>
@@ -612,7 +612,7 @@
<test-suite name='Attendee remove instance, then organizer cancel'>
<test name='1'>
<description>Organizer invites Attendee 2 with override</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/4.ics</ruri>
<data>
@@ -626,7 +626,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/4.ics</ruri>
<verify>
@@ -640,14 +640,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Items</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -662,7 +662,7 @@
</test>
<test name='5'>
<description>Attendee -> Accepted/Removed</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$event2:</ruri>
<data>
@@ -673,7 +673,7 @@
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$event2:</ruri>
<verify>
@@ -687,14 +687,14 @@
</test>
<test name='6'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='7'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/4.ics</ruri>
<verify>
@@ -708,7 +708,7 @@
</test>
<test name='8'>
<description>Organizer removes override</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/4.ics</ruri>
<data>
@@ -722,7 +722,7 @@
</test>
<test name='9'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/4.ics</ruri>
<verify>
@@ -736,14 +736,14 @@
</test>
<test name='10'>
<description>Attendee Inbox Items</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 2</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='11'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$event2:</ruri>
<verify>
@@ -764,14 +764,16 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 4</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
- <ruri>$inboxpath3:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitreschedule.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitreschedule.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitreschedule.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -35,16 +35,12 @@
<method>GET</method>
<ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>GET</method>
- <ruri>$calendarpath3:/</ruri>
- </request>
</start>
<test-suite name='Non-recurring' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -58,7 +54,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -72,14 +68,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -93,14 +89,14 @@
</test>
<test name='6'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -114,14 +110,14 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -135,7 +131,7 @@
</test>
<test name='9'>
<description>Organizer changes time</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -149,7 +145,7 @@
</test>
<test name='10'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -163,14 +159,14 @@
</test>
<test name='11'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='12'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -182,39 +178,28 @@
</verify>
</request>
</test>
- <test name='14'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$calendarpath3:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
- </request>
</test>
</test-suite>
<test-suite name='Recurring overridden' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -228,7 +213,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -242,14 +227,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -263,14 +248,14 @@
</test>
<test name='6'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -284,14 +269,14 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -305,7 +290,7 @@
</test>
<test name='9'>
<description>Organizer changes time</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -319,7 +304,7 @@
</test>
<test name='10'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -333,14 +318,14 @@
</test>
<test name='11'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='12'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -352,32 +337,21 @@
</verify>
</request>
</test>
- <test name='14'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$calendarpath3:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
- </request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -35,22 +35,12 @@
<method>GET</method>
<ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
- </request>
</start>
- <test-suite name='Simple Changes' ignore='no'>
+ <test-suite name='Simple Changes'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -64,7 +54,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -78,11 +68,11 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$inboxpath2:/</ruri>
<verify>
@@ -95,7 +85,7 @@
<feature>schedule-changes</feature>
</require-feature>
<description>Attendee Inbox Item schedule-changes</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$</ruri>
<header>
@@ -117,7 +107,7 @@
</test>
<test name='5'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -131,21 +121,21 @@
</test>
<test name='6'>
<description>Attendee deletes Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='7'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -159,11 +149,11 @@
</test>
<test name='8'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITCOUNT 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>GETNEW</method>
<ruri>$inboxpath1:/</ruri>
<verify>
@@ -181,7 +171,7 @@
<feature>schedule-changes</feature>
</require-feature>
<description>Organizer Inbox Item schedule-changes</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$</ruri>
<header>
@@ -206,14 +196,14 @@
</test>
<test name='10'>
<description>Organizer deletes Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='11'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -227,7 +217,7 @@
</test>
<test name='12'>
<description>Organizer changes Summary</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -241,7 +231,7 @@
</test>
<test name='13'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -255,11 +245,11 @@
</test>
<test name='14'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$inboxpath2:/</ruri>
<verify>
@@ -272,7 +262,7 @@
<feature>schedule-changes</feature>
</require-feature>
<description>Attendee Inbox Item schedule-changes</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$</ruri>
<header>
@@ -296,7 +286,7 @@
</test>
<test name='16'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -310,21 +300,21 @@
</test>
<test name='17'>
<description>Attendee deletes Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='18'>
<description>Attendee -> Declined</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -338,11 +328,11 @@
</test>
<test name='19'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITCOUNT 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>GETNEW</method>
<ruri>$inboxpath1:/</ruri>
<verify>
@@ -355,7 +345,7 @@
<feature>schedule-changes</feature>
</require-feature>
<description>Organizer Inbox Item schedule-changes</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$</ruri>
<header>
@@ -380,14 +370,14 @@
</test>
<test name='21'>
<description>Organizer deletes Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='22'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -399,35 +389,28 @@
</verify>
</request>
</test>
- <test name='23'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELAY</method>
- <ruri>2</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Organizer Delete' ignore='no'>
+ <test-suite name='Organizer Delete'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/2.ics</ruri>
<data>
@@ -441,7 +424,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/2.ics</ruri>
<verify>
@@ -455,11 +438,11 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$inboxpath2:/</ruri>
<verify>
@@ -474,7 +457,7 @@
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -488,21 +471,21 @@
</test>
<test name='5'>
<description>Attendee deletes Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='6'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -516,14 +499,14 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/2.ics</ruri>
<verify>
@@ -537,7 +520,7 @@
</test>
<test name='10'>
<description>Organizer deletes data</description>
- <request print-response='no'>
+ <request>
<method>DELETE</method>
<ruri>$calendarpath1:/2.ics</ruri>
<verify>
@@ -551,11 +534,11 @@
</test>
<test name='11'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$inboxpath2:/</ruri>
<verify>
@@ -578,7 +561,7 @@
<feature>schedule-changes</feature>
</require-feature>
<description>Attendee Inbox Item schedule-changes</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$</ruri>
<header>
@@ -600,7 +583,7 @@
</test>
<test name='13'>
<description>Attendee has cancelled data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -614,7 +597,7 @@
</test>
<test name='14'>
<description>Attendee deletes data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$</ruri>
<verify>
@@ -624,12 +607,12 @@
</test>
<test name='15'>
<description>Attendee deletes Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
- <test name='16'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -639,25 +622,13 @@
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELAY</method>
- <ruri>2</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
</test>
</test-suite>
- <test-suite name='Attendee Delete' ignore='no'>
+ <test-suite name='Attendee Delete'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/3.ics</ruri>
<data>
@@ -671,7 +642,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/3.ics</ruri>
<verify>
@@ -685,14 +656,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -706,14 +677,14 @@
</test>
<test name='6'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -727,14 +698,14 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/3.ics</ruri>
<verify>
@@ -748,14 +719,14 @@
</test>
<test name='10'>
<description>Attendee deletes data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$</ruri>
<verify>
@@ -769,14 +740,14 @@
</test>
<test name='11'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='12'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/3.ics</ruri>
<verify>
@@ -788,35 +759,25 @@
</verify>
</request>
</test>
- <test name='14'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELAY</method>
- <ruri>2</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Alarms' ignore='no'>
+ <test-suite name='Alarms'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/4.ics</ruri>
<data>
@@ -830,7 +791,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/4.ics</ruri>
<verify>
@@ -844,11 +805,11 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$inboxpath2:/</ruri>
<verify>
@@ -859,14 +820,14 @@
</arg>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -880,14 +841,14 @@
</test>
<test name='6'>
<description>Attendee -> Accepted + alarm</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -901,11 +862,11 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITCOUNT 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>GETNEW</method>
<ruri>$inboxpath1:/</ruri>
<verify>
@@ -916,14 +877,14 @@
</arg>
</verify>
</request>
- <request print-response='no'>
+ <request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/4.ics</ruri>
<verify>
@@ -937,7 +898,7 @@
</test>
<test name='10'>
<description>Organizer changes Time leaves their alarm</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/4.ics</ruri>
<data>
@@ -951,7 +912,7 @@
</test>
<test name='11'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/4.ics</ruri>
<verify>
@@ -965,11 +926,11 @@
</test>
<test name='12'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$inboxpath2:/</ruri>
<verify>
@@ -980,14 +941,14 @@
</arg>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='13'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1001,7 +962,7 @@
</test>
<test name='15'>
<description>Organizer changes alarm</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/4.ics</ruri>
<data>
@@ -1015,7 +976,7 @@
</test>
<test name='16'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/4.ics</ruri>
<verify>
@@ -1029,7 +990,7 @@
</test>
<test name='17'>
<description>Attendee no Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$inboxpath2:/</ruri>
<header>
@@ -1051,7 +1012,7 @@
</test>
<test name='18'>
<description>Attendee has unchanged data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1065,7 +1026,7 @@
</test>
<test name='19'>
<description>Organizer removes alarm</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/4.ics</ruri>
<data>
@@ -1079,7 +1040,7 @@
</test>
<test name='20'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/4.ics</ruri>
<verify>
@@ -1093,7 +1054,7 @@
</test>
<test name='21'>
<description>Attendee no Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$inboxpath2:/</ruri>
<header>
@@ -1115,7 +1076,7 @@
</test>
<test name='22'>
<description>Attendee has unchanged data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1129,14 +1090,14 @@
</test>
<test name='23'>
<description>Attendee changes alarm</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1150,7 +1111,7 @@
</test>
<test name='24'>
<description>Organizer no Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$inboxpath1:/</ruri>
<header>
@@ -1172,7 +1133,7 @@
</test>
<test name='25'>
<description>Organizer data unchanged</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/4.ics</ruri>
<verify>
@@ -1184,31 +1145,28 @@
</verify>
</request>
</test>
- <test name='26'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Recurring Alarms' ignore='no'>
+ <test-suite name='Recurring Alarms'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/4-1.ics</ruri>
<data>
@@ -1222,7 +1180,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/4-1.ics</ruri>
<verify>
@@ -1236,14 +1194,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1257,14 +1215,14 @@
</test>
<test name='6'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1278,14 +1236,14 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/4-1.ics</ruri>
<verify>
@@ -1299,14 +1257,14 @@
</test>
<test name='10'>
<description>Attendee -> adds overridden alarm</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1320,7 +1278,7 @@
</test>
<test name='11'>
<description>Organizer changes summary</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/4-1.ics</ruri>
<data>
@@ -1334,14 +1292,14 @@
</test>
<test name='12'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='13'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1353,31 +1311,28 @@
</verify>
</request>
</test>
- <test name='15'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='No X- properties' ignore='no'>
+ <test-suite name='No X- properties'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1391,7 +1346,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1405,11 +1360,11 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$inboxpath2:/</ruri>
<verify>
@@ -1420,14 +1375,14 @@
</arg>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1441,7 +1396,7 @@
</test>
<test name='6'>
<description>Organizer adds an X-</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1455,7 +1410,7 @@
</test>
<test name='7'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1469,7 +1424,7 @@
</test>
<test name='8'>
<description>Attendee no Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$inboxpath2:/</ruri>
<header>
@@ -1491,7 +1446,7 @@
</test>
<test name='9'>
<description>Attendee data unchanged</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1505,14 +1460,14 @@
</test>
<test name='10'>
<description>Attendee adds X-</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1526,7 +1481,7 @@
</test>
<test name='11'>
<description>Organizer no Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$inboxpath1:/</ruri>
<header>
@@ -1548,7 +1503,7 @@
</test>
<test name='12'>
<description>Organizer data unchanged</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1560,31 +1515,28 @@
</verify>
</request>
</test>
- <test name='13'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='TZID reset' ignore='no'>
+ <test-suite name='TZID reset'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1598,7 +1550,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1612,11 +1564,11 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$inboxpath2:/</ruri>
<verify>
@@ -1627,14 +1579,14 @@
</arg>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1648,14 +1600,14 @@
</test>
<test name='6'>
<description>Attendee tries to change TZID with ACCEPT</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1669,7 +1621,7 @@
</test>
<test name='7'>
<description>Attendee has data with original TZID</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$</ruri>
<verify>
@@ -1683,14 +1635,14 @@
</test>
<test name='8'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='9'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1702,31 +1654,28 @@
</verify>
</request>
</test>
- <test name='10'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='No master Organizer' ignore='no'>
+ <test-suite name='No master Organizer'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/2.ics</ruri>
<data>
@@ -1740,7 +1689,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/2.ics</ruri>
<verify>
@@ -1754,14 +1703,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1775,14 +1724,14 @@
</test>
<test name='6'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1796,14 +1745,14 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/2.ics</ruri>
<verify>
@@ -1817,7 +1766,7 @@
</test>
<test name='10'>
<description>Organizer deletes data</description>
- <request print-response='no'>
+ <request>
<method>DELETE</method>
<ruri>$calendarpath1:/2.ics</ruri>
<verify>
@@ -1831,14 +1780,14 @@
</test>
<test name='11'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='12'>
<description>Attendee has cancelled data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1852,7 +1801,7 @@
</test>
<test name='13'>
<description>Attendee deletes data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$</ruri>
<verify>
@@ -1860,31 +1809,25 @@
</verify>
</request>
</test>
- <test name='15'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Duplicate Attendee' ignore='no'>
+ <test-suite name='Duplicate Attendee'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/2.ics</ruri>
<data>
@@ -1898,7 +1841,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/2.ics</ruri>
<verify>
@@ -1912,14 +1855,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1933,14 +1876,14 @@
</test>
<test name='6'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1954,14 +1897,14 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/2.ics</ruri>
<verify>
@@ -1978,26 +1921,23 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Per-Attendee X- properties' ignore='no'>
+ <test-suite name='Per-Attendee X- properties'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -2011,7 +1951,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -2025,14 +1965,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -2046,7 +1986,7 @@
</test>
<test name='5'>
<description>Attendee -> Accepted with X-</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -2060,14 +2000,14 @@
</test>
<test name='6'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='7'>
<description>Organizer data changed - no X-</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -2081,7 +2021,7 @@
</test>
<test name='8'>
<description>Organizer changes Summary</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -2095,7 +2035,7 @@
</test>
<test name='9'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -2109,14 +2049,14 @@
</test>
<test name='10'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='16'>
<description>Attendee has data - X- preserved</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -2133,22 +2073,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELAY</method>
- <ruri>2</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario2.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario2.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario2.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -262,31 +262,28 @@
</verify>
</request>
</test>
- <test name='18'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$calendarpath3:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
+ <ruri>$calendarpath3:/</ruri>
</request>
</test>
</test-suite>
@@ -425,32 +422,21 @@
</verify>
</request>
</test>
- <test name='14'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$calendarpath3:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
- </request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario3.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario3.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario3.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -366,10 +366,13 @@
<ruri>$calendarpath1:/</ruri>
<ruri>$inboxpath1:/</ruri>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduleagent.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduleagent.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduleagent.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -525,19 +525,22 @@
</verify>
</request>
</test>
- <test name='39'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$calendarpath3:/</ruri>
- <ruri>$calendarpath4:/</ruri>
<ruri>$inboxpath1:/</ruri>
- <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
- <ruri>$inboxpath4:/</ruri>
</request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ <ruri>$calendarpath3:/</ruri>
+ </request>
</test>
</test-suite>
@@ -706,16 +709,17 @@
</verify>
</request>
</test>
- <test name='11'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$calendarpath3:/</ruri>
- <ruri>$inboxpath1:/</ruri>
- <ruri>$inboxpath2:/</ruri>
- <ruri>$inboxpath3:/</ruri>
</request>
</test>
</test-suite>
@@ -867,17 +871,26 @@
</verify>
</request>
</test>
- <test name='11'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$calendarpath3:/</ruri>
<ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ <ruri>$calendarpath3:/</ruri>
+ </request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitschedulechanges.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitschedulechanges.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitschedulechanges.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -250,23 +250,20 @@
<ruri>$inboxpath2:/</ruri>
</request>
</test>
- <test name='9'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -438,23 +435,20 @@
<ruri>$inboxpath2:/</ruri>
</request>
</test>
- <test name='7'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -572,23 +566,20 @@
<ruri>$inboxpath1:/</ruri>
</request>
</test>
- <test name='5'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -764,23 +755,20 @@
<ruri>$inboxpath2:/</ruri>
</request>
</test>
- <test name='7'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
@@ -966,18 +954,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -41,7 +41,7 @@
</request>
</start>
- <test-suite name='No schedule-tag' ignore='no'>
+ <test-suite name='No schedule-tag'>
<test name='1'>
<description>Create new event - no header</description>
<request print-response="no">
@@ -87,7 +87,7 @@
</test>
</test-suite>
- <test-suite name='Update to resource with schedule-tag behavior' ignore='no'>
+ <test-suite name='Update to resource with schedule-tag behavior'>
<test name='1'>
<description>Updated event has schedule tag header</description>
<request print-response="no">
@@ -187,7 +187,7 @@
</test>
</test-suite>
- <test-suite name='Change to resource with schedule-tag behavior' ignore='no'>
+ <test-suite name='Change to resource with schedule-tag behavior'>
<test name='1'>
<description>Updated event has schedule tag header</description>
<request print-response="no">
@@ -287,7 +287,7 @@
</test>
</test-suite>
- <test-suite name='Organizer change to resource with valid If-Schedule-Tag-Match' ignore='no'>
+ <test-suite name='Organizer change to resource with valid If-Schedule-Tag-Match'>
<test name='1'>
<description>Updated event has schedule tag header</description>
<request print-response="no">
@@ -391,7 +391,7 @@
</test>
</test-suite>
- <test-suite name='Organizer change to resource with invalid If-Schedule-Tag-Match' ignore='no'>
+ <test-suite name='Organizer change to resource with invalid If-Schedule-Tag-Match'>
<test name='1'>
<description>Updated event has schedule tag header</description>
<request print-response="no">
@@ -499,7 +499,7 @@
</test>
</test-suite>
- <test-suite name='Attendee non-PARTSTAT change to resource with valid If-Schedule-Tag-Match' ignore='no'>
+ <test-suite name='Attendee non-PARTSTAT change to resource with valid If-Schedule-Tag-Match'>
<test name='1'>
<description>Updated event has schedule tag header</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
@@ -621,7 +621,7 @@
</test>
</test-suite>
- <test-suite name='Attendee change to resource with invalid If-Schedule-Tag-Match' ignore='no'>
+ <test-suite name='Attendee change to resource with invalid If-Schedule-Tag-Match'>
<test name='1'>
<description>Updated event has schedule tag header</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
@@ -729,7 +729,7 @@
</test>
</test-suite>
- <test-suite name='Remove resource schedule-tag behavior' ignore='no'>
+ <test-suite name='Remove resource schedule-tag behavior'>
<test name='1'>
<description>Updated event has schedule tag header</description>
<request print-response="no">
@@ -750,6 +750,10 @@
</arg>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Matching property</description>
@@ -773,7 +777,7 @@
</verify>
</request>
</test>
- <test name='5'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
@@ -785,7 +789,7 @@
</test>
</test-suite>
- <test-suite name='New resource schedule-tag behavior' ignore='no'>
+ <test-suite name='New resource schedule-tag behavior'>
<test name='1'>
<description>New event has schedule tag header</description>
<request print-response="no">
@@ -935,7 +939,7 @@
</test>
</test-suite>
- <test-suite name='Organizer change' ignore='no'>
+ <test-suite name='Organizer change'>
<test name='1'>
<description>Updated event has changed schedule tag header</description>
<request print-response="no">
@@ -1104,7 +1108,7 @@
</test>
</test-suite>
- <test-suite name='Attendee 02 change' ignore='no'>
+ <test-suite name='Attendee 02 change'>
<test name='1'>
<description>Updated event has changed schedule tag header</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
@@ -1265,7 +1269,7 @@
</test>
</test-suite>
- <test-suite name='Attendee 03 change' ignore='no'>
+ <test-suite name='Attendee 03 change'>
<test name='1'>
<description>Updated event has changed schedule tag header</description>
<request user="$userid3:" pswd="$pswd3:" print-response="no">
@@ -1426,7 +1430,7 @@
</test>
</test-suite>
- <test-suite name='Organizer Merge' ignore='no'>
+ <test-suite name='Organizer Merge'>
<test name='1'>
<description>Updated event that has changed on disk</description>
<request print-response="no">
@@ -1618,7 +1622,7 @@
</test>
</test-suite>
- <test-suite name='Attendee Merge' ignore='no'>
+ <test-suite name='Attendee Merge'>
<test name='1'>
<description>Get current schedule tag header values</description>
<request print-response='no'>
@@ -1776,28 +1780,38 @@
</verify>
</request>
</test>
- <test name='5'>
+ <test name='-1'>
<description>Clean-up</description>
- <request user="$userid1:" pswd="$pswd1:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath3:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Organizer Delete with ETag' ignore='no'>
+ <test-suite name='Organizer Delete with ETag'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -1960,28 +1974,22 @@
</verify>
</request>
</test>
- <test name='16'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Organizer Delete with Schedule-Tag' ignore='no'>
+ <test-suite name='Organizer Delete with Schedule-Tag'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -2144,28 +2152,22 @@
</verify>
</request>
</test>
- <test name='16'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Organizer MOVE with ETag' ignore='no'>
+ <test-suite name='Organizer MOVE with ETag'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -2327,28 +2329,25 @@
</verify>
</request>
</test>
- <test name='13'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Organizer MOVE with Schedule-Tag' ignore='no'>
+ <test-suite name='Organizer MOVE with Schedule-Tag'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -2510,28 +2509,25 @@
</verify>
</request>
</test>
- <test name='13'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='Organizer Re-invite with Schedule-Tag' ignore='no'>
+ <test-suite name='Organizer Re-invite with Schedule-Tag'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -2688,28 +2684,25 @@
</verify>
</request>
</test>
- <test name='15'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
- <test-suite name='ETag change with Schedule-tag' ignore='no'>
+ <test-suite name='ETag change with Schedule-tag'>
<test name='1'>
<description>New event</description>
<request print-response="no">
@@ -2723,6 +2716,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
</test>
<test name='2'>
<description>Get event</description>
@@ -2828,18 +2829,32 @@
</verify>
</request>
</test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath3:/</ruri>
+ </request>
+ </test>
</test-suite>
- <end>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
- <ruri>$inboxpath1:/</ruri>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
- <ruri>$calendarpath3:/</ruri>
- <ruri>$inboxpath3:/</ruri>
- </request>
- </end>
+ <end/>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitsecurity.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitsecurity.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitsecurity.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -37,10 +37,10 @@
</request>
</start>
- <test-suite name='Prevent ORGANIZER forgeries' ignore='no'>
+ <test-suite name='Prevent ORGANIZER forgeries'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -54,7 +54,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -68,14 +68,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -89,7 +89,7 @@
</test>
<test name='6'>
<description>Malicious user invites Attendee with UID forgery</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$calendarpath3:/1.ics</ruri>
<data>
@@ -100,10 +100,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request>
+ <method>DELAY</method>
+ <ruri>2</ruri>
+ </request>
</test>
<test name='7'>
<description>Organizer checks same data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -117,7 +121,7 @@
</test>
<test name='8'>
<description>Attendee has same data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -131,7 +135,7 @@
</test>
<test name='9'>
<description>Malicious user has error data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GET</method>
<ruri>$calendarpath3:/1.ics</ruri>
<verify>
@@ -151,6 +155,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
@@ -163,10 +171,10 @@
</test>
</test-suite>
- <test-suite name='Prevent ATTENDEE party crash' ignore='no'>
+ <test-suite name='Prevent ATTENDEE party crash'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -180,7 +188,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -194,14 +202,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -215,7 +223,7 @@
</test>
<test name='6'>
<description>Malicious user tries to party crash with UID forgery</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$calendarpath3:/1.ics</ruri>
<data>
@@ -233,7 +241,7 @@
</test>
<test name='7'>
<description>Organizer checks same data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -247,7 +255,7 @@
</test>
<test name='8'>
<description>Attendee has same data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -267,6 +275,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
@@ -279,10 +291,10 @@
</test>
</test-suite>
- <test-suite name='Prevent ATTENDEE switching ORGANIZER via new event' ignore='no'>
+ <test-suite name='Prevent ATTENDEE switching ORGANIZER via new event'>
<test name='1'>
<description>Organizer invites Attendees</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -296,7 +308,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -310,14 +322,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -331,14 +343,14 @@
</test>
<test name='6'>
<description>Attendee Inbox Item</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='7'>
<description>Attendee has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -352,7 +364,7 @@
</test>
<test name='9'>
<description>Malicious user tries to change ORGANIZER</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$calendarpath3:/1.ics</ruri>
<data>
@@ -370,7 +382,7 @@
</test>
<test name='10'>
<description>Organizer checks same data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -384,7 +396,7 @@
</test>
<test name='11'>
<description>Attendee has same data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -398,7 +410,7 @@
</test>
<test name='12'>
<description>Attendee has same data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -418,11 +430,19 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
<ruri>$inboxpath3:/</ruri>
@@ -430,10 +450,10 @@
</test>
</test-suite>
- <test-suite name='Prevent ATTENDEE switching ORGANIZER via overwrite' ignore='no'>
+ <test-suite name='Prevent ATTENDEE switching ORGANIZER via overwrite'>
<test name='1'>
<description>Organizer invites Attendees</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -447,7 +467,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -461,14 +481,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -482,14 +502,14 @@
</test>
<test name='6'>
<description>Attendee Inbox Item</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='8'>
<description>Attendee has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -503,7 +523,7 @@
</test>
<test name='9'>
<description>Malicious user tries to change ORGANIZER</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -521,7 +541,7 @@
</test>
<test name='10'>
<description>Organizer checks same data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -535,7 +555,7 @@
</test>
<test name='11'>
<description>Attendee has same data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -549,7 +569,7 @@
</test>
<test name='12'>
<description>Attendee has same data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -569,11 +589,19 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
<ruri>$inboxpath3:/</ruri>
@@ -581,10 +609,10 @@
</test>
</test-suite>
- <test-suite name='Prevent ATTENDEE switching ORGANIZER (someone else - an attendee) via overwrite' ignore='no'>
+ <test-suite name='Prevent ATTENDEE switching ORGANIZER (someone else - an attendee) via overwrite'>
<test name='1'>
<description>Organizer invites Attendees</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -598,7 +626,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -612,14 +640,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -633,14 +661,14 @@
</test>
<test name='6'>
<description>Attendee Inbox Item</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='8'>
<description>Attendee has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -654,7 +682,7 @@
</test>
<test name='9'>
<description>Malicious user tries to change ORGANIZER</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -672,7 +700,7 @@
</test>
<test name='10'>
<description>Organizer checks same data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -686,7 +714,7 @@
</test>
<test name='11'>
<description>Attendee has same data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -700,7 +728,7 @@
</test>
<test name='12'>
<description>Attendee has same data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -720,11 +748,19 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
<ruri>$inboxpath3:/</ruri>
@@ -732,10 +768,10 @@
</test>
</test-suite>
- <test-suite name='Prevent ATTENDEE switching ORGANIZER (someone else - not an attendee) via overwrite' ignore='no'>
+ <test-suite name='Prevent ATTENDEE switching ORGANIZER (someone else - not an attendee) via overwrite'>
<test name='1'>
<description>Organizer invites Attendees</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -749,7 +785,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -763,14 +799,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -784,14 +820,14 @@
</test>
<test name='6'>
<description>Attendee Inbox Item</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='8'>
<description>Attendee has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -805,7 +841,7 @@
</test>
<test name='9'>
<description>Malicious user tries to change ORGANIZER</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -823,7 +859,7 @@
</test>
<test name='10'>
<description>Organizer checks same data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -837,7 +873,7 @@
</test>
<test name='11'>
<description>Attendee has same data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -851,7 +887,7 @@
</test>
<test name='12'>
<description>Attendee has same data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -871,11 +907,19 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
<ruri>$inboxpath3:/</ruri>
@@ -883,10 +927,10 @@
</test>
</test-suite>
- <test-suite name='Prevent ORGANIZER switching ORGANIZER without them as ATTENDEE via overwrite' ignore='no'>
+ <test-suite name='Prevent ORGANIZER switching ORGANIZER without them as ATTENDEE via overwrite'>
<test name='1'>
<description>Organizer invites Attendees</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -900,7 +944,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -914,14 +958,18 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
</test>
<test name='5'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -935,7 +983,7 @@
</test>
<test name='6'>
<description>Bad client tries to change ORGANIZER</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -953,7 +1001,7 @@
</test>
<test name='7'>
<description>Organizer checks same data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -967,7 +1015,7 @@
</test>
<test name='8'>
<description>Attendee has same data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -981,7 +1029,7 @@
</test>
<test name='9'>
<description>Attendee has same data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -1001,11 +1049,19 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
<ruri>$inboxpath3:/</ruri>
@@ -1013,10 +1069,10 @@
</test>
</test-suite>
- <test-suite name='Prevent ATTENDEE switching ORGANIZER without them as ATTENDEE via overwrite' ignore='no'>
+ <test-suite name='Prevent ATTENDEE switching ORGANIZER without them as ATTENDEE via overwrite'>
<test name='1'>
<description>Organizer invites Attendees</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
<data>
@@ -1030,7 +1086,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1044,14 +1100,18 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
</test>
<test name='5'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1065,7 +1125,7 @@
</test>
<test name='6'>
<description>Bad client tries to change ORGANIZER</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1083,7 +1143,7 @@
</test>
<test name='7'>
<description>Organizer checks same data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarpath1:/1.ics</ruri>
<verify>
@@ -1097,7 +1157,7 @@
</test>
<test name='8'>
<description>Attendee has same data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -1111,7 +1171,7 @@
</test>
<test name='9'>
<description>Attendee has same data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
<verify>
@@ -1131,11 +1191,19 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$calendarpath3:/</ruri>
<ruri>$inboxpath3:/</ruri>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitsequence.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitsequence.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitsequence.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -35,16 +35,6 @@
<method>GET</method>
<ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
- </request>
</start>
<test-suite name='Lower Sequence' ignore='no'>
@@ -179,22 +169,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELAY</method>
- <ruri>2</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitsharing.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitsharing.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitsharing.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -36,21 +36,11 @@
<method>GET</method>
<ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
- </request>
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>POST</method>
<ruri>$calendarhome1:/shared/</ruri>
<data>
@@ -61,11 +51,11 @@
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath3:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$notificationpath3:/</ruri>
<grabelement>
@@ -77,11 +67,11 @@
<variable>$hosturl3:</variable>
</grabelement>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETE</method>
<ruri>$</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>POST</method>
<ruri>$calendarhome3:/</ruri>
<data substitutions='yes'>
@@ -97,7 +87,7 @@
<method>MKCALENDAR</method>
<ruri>$calendarhome2:/shared/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>POST</method>
<ruri>$calendarhome2:/shared/</ruri>
<data>
@@ -108,11 +98,11 @@
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath3:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$notificationpath3:/</ruri>
<grabelement>
@@ -124,11 +114,11 @@
<variable>$hosturl23:</variable>
</grabelement>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETE</method>
<ruri>$</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>POST</method>
<ruri>$calendarhome3:/</ruri>
<data substitutions='yes'>
@@ -145,7 +135,7 @@
<test-suite name='Organizer shared calendar' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$calendarhome1:/shared/1.ics</ruri>
<data>
@@ -159,7 +149,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarhome1:/shared/1.ics</ruri>
<verify>
@@ -173,7 +163,7 @@
</test>
<test name='3'>
<description>Sharee checks data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GET</method>
<ruri>$sharedcalendar3_1:/1.ics</ruri>
<verify>
@@ -187,14 +177,14 @@
</test>
<test name='4'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='5'>
<description>Attendee has data and moves</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
<verify>
@@ -205,7 +195,7 @@
</arg>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>MOVE</method>
<ruri>$</ruri>
<header>
@@ -216,7 +206,7 @@
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GET</method>
<ruri>$sharedcalendar3_2:/move1.ics</ruri>
<verify>
@@ -230,7 +220,7 @@
</test>
<test name='6'>
<description>Sharee adds alarm to organizer event</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$sharedcalendar3_1:/1.ics</ruri>
<data>
@@ -241,7 +231,7 @@
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GET</method>
<ruri>$sharedcalendar3_1:/1.ics</ruri>
<verify>
@@ -252,7 +242,7 @@
</arg>
</verify>
</request>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarhome1:/shared/1.ics</ruri>
<verify>
@@ -266,7 +256,7 @@
</test>
<test name='7'>
<description>Sharee tries to change organizer subject</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$sharedcalendar3_1:/1.ics</ruri>
<data>
@@ -281,7 +271,7 @@
</arg>
</verify>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GET</method>
<ruri>$sharedcalendar3_1:/1.ics</ruri>
<verify>
@@ -292,7 +282,7 @@
</arg>
</verify>
</request>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarhome1:/shared/1.ics</ruri>
<verify>
@@ -306,7 +296,7 @@
</test>
<test name='8'>
<description>Sharee tries to change organizer partstat</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$sharedcalendar3_1:/1.ics</ruri>
<data>
@@ -321,7 +311,7 @@
</arg>
</verify>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GET</method>
<ruri>$sharedcalendar3_1:/1.ics</ruri>
<verify>
@@ -332,7 +322,7 @@
</arg>
</verify>
</request>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarhome1:/shared/1.ics</ruri>
<verify>
@@ -346,7 +336,7 @@
</test>
<test name='9'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$calendarhome2:/shared/move1.ics</ruri>
<data>
@@ -360,14 +350,14 @@
</test>
<test name='10'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='11'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$calendarhome1:/shared/1.ics</ruri>
<verify>
@@ -381,7 +371,7 @@
</test>
<test name='12'>
<description>Sharee checks data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GET</method>
<ruri>$sharedcalendar3_1:/1.ics</ruri>
<verify>
@@ -395,7 +385,7 @@
</test>
<test name='13'>
<description>Sharee adds alarm to attendee event</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$sharedcalendar3_2:/move1.ics</ruri>
<data>
@@ -406,7 +396,7 @@
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GET</method>
<ruri>$sharedcalendar3_2:/move1.ics</ruri>
<verify>
@@ -417,7 +407,7 @@
</arg>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$calendarhome2:/shared/move1.ics</ruri>
<verify>
@@ -434,22 +424,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarhome1:/shared/</ruri>
+ <ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELAY</method>
- <ruri>2</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicittimezones.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicittimezones.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicittimezones.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -183,18 +183,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -44,7 +44,7 @@
<test-suite name='Simple Changes' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$taskspath1:/1.ics</ruri>
<data>
@@ -58,7 +58,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/1.ics</ruri>
<verify>
@@ -72,18 +72,18 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$</ruri>
<header>
@@ -102,14 +102,14 @@
</arg>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
@@ -123,14 +123,14 @@
</test>
<test name='6'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -144,18 +144,18 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITCOUNT 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>GETNEW</method>
<ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$</ruri>
<header>
@@ -177,14 +177,14 @@
</arg>
</verify>
</request>
- <request print-response='no'>
+ <request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/1.ics</ruri>
<verify>
@@ -198,7 +198,7 @@
</test>
<test name='10'>
<description>Organizer adds DUE</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$taskspath1:/1.ics</ruri>
<data>
@@ -212,7 +212,7 @@
</test>
<test name='11'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/1.ics</ruri>
<verify>
@@ -226,18 +226,18 @@
</test>
<test name='12'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$inboxpath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$</ruri>
<header>
@@ -258,14 +258,14 @@
</arg>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='13'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
@@ -279,14 +279,14 @@
</test>
<test name='15'>
<description>Attendee -> Declined</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -300,18 +300,18 @@
</test>
<test name='16'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITCOUNT 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request print-response='no'>
+ <request>
<method>GETNEW</method>
<ruri>$inboxpath1:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request print-response='no'>
+ <request>
<method>PROPFIND</method>
<ruri>$</ruri>
<header>
@@ -333,14 +333,14 @@
</arg>
</verify>
</request>
- <request print-response='no'>
+ <request>
<method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='17'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/1.ics</ruri>
<verify>
@@ -357,18 +357,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$taskspath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$taskspath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$taskspath2:/</ruri>
</request>
</test>
</test-suite>
@@ -376,7 +373,7 @@
<test-suite name='Organizer Delete' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$taskspath1:/2.ics</ruri>
<data>
@@ -390,7 +387,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/2.ics</ruri>
<verify>
@@ -404,14 +401,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
@@ -425,14 +422,14 @@
</test>
<test name='6'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -446,14 +443,14 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/2.ics</ruri>
<verify>
@@ -467,7 +464,7 @@
</test>
<test name='10'>
<description>Organizer deletes data</description>
- <request print-response='no'>
+ <request>
<method>DELETE</method>
<ruri>$taskspath1:/2.ics</ruri>
<verify>
@@ -481,11 +478,11 @@
</test>
<test name='11'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITCOUNT 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$inboxpath2:/</ruri>
<verify>
@@ -497,7 +494,7 @@
</arg>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$</ruri>
<header>
@@ -516,14 +513,14 @@
</arg>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='12'>
<description>Attendee has cancelled data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
@@ -537,7 +534,7 @@
</test>
<test name='13'>
<description>Attendee deletes data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$</ruri>
<verify>
@@ -550,17 +547,11 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$taskspath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$taskspath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
@@ -569,7 +560,7 @@
<test-suite name='Attendee Delete' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$taskspath1:/3.ics</ruri>
<data>
@@ -583,7 +574,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/3.ics</ruri>
<verify>
@@ -597,14 +588,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
@@ -618,14 +609,14 @@
</test>
<test name='6'>
<description>Attendee -> Accepted</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -639,14 +630,14 @@
</test>
<test name='7'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='8'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/3.ics</ruri>
<verify>
@@ -660,14 +651,14 @@
</test>
<test name='10'>
<description>Attendee deletes data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
<ruri>$</ruri>
<verify>
@@ -681,14 +672,14 @@
</test>
<test name='11'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='12'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/3.ics</ruri>
<verify>
@@ -705,17 +696,11 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$taskspath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$taskspath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
@@ -724,7 +709,7 @@
<test-suite name='Per-attendee completed' ignore='no'>
<test name='1'>
<description>Organizer invites two Attendees</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$taskspath1:/1.ics</ruri>
<data>
@@ -738,7 +723,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/1.ics</ruri>
<verify>
@@ -752,14 +737,14 @@
</test>
<test name='3'>
<description>Attendee 2 Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee 2 has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
@@ -773,14 +758,14 @@
</test>
<test name='6'>
<description>Attendee 3 Inbox Item</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath3:/</ruri>
</request>
</test>
<test name='7'>
<description>Attendee 3 has data</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$taskspath3:/</ruri>
<verify>
@@ -794,14 +779,14 @@
</test>
<test name='9'>
<description>Attendee 2 -> Completed</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -815,14 +800,14 @@
</test>
<test name='10'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='11'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/1.ics</ruri>
<verify>
@@ -836,7 +821,7 @@
</test>
<test name='13'>
<description>Attendee 3 data changed</description>
- <request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:" wait-for-success="yes">
<method>GETNEW</method>
<ruri>$taskspath3:/</ruri>
<verify>
@@ -850,14 +835,14 @@
</test>
<test name='14'>
<description>Attendee 3 -> Completed</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>GETNEW</method>
<ruri>$taskspath3:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -871,14 +856,14 @@
</test>
<test name='15'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='16'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/1.ics</ruri>
<verify>
@@ -892,7 +877,7 @@
</test>
<test name='18'>
<description>Attendee 2 data changed</description>
- <request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:" wait-for-success="yes">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
@@ -912,14 +897,20 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$taskspath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
<ruri>$taskspath3:/</ruri>
- <ruri>$inboxpath3:/</ruri>
</request>
</test>
</test-suite>
@@ -927,7 +918,7 @@
<test-suite name='Client removing properties fix' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$taskspath1:/1.ics</ruri>
<data>
@@ -941,7 +932,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/1.ics</ruri>
<verify>
@@ -955,14 +946,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
@@ -976,7 +967,7 @@
</test>
<test name='6'>
<description>Organizer updates but loses properties</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$taskspath1:/1.ics</ruri>
<data>
@@ -987,10 +978,14 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name='7'>
<description>Organizer checks data - properties are back</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/1.ics</ruri>
<verify>
@@ -1004,14 +999,14 @@
</test>
<test name='8'>
<description>Attendee -> Completed and loses properties</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1025,7 +1020,7 @@
</test>
<test name='9'>
<description>Attendee has data - properties are back</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
@@ -1042,18 +1037,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$taskspath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$taskspath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$taskspath2:/</ruri>
</request>
</test>
</test-suite>
@@ -1061,7 +1053,7 @@
<test-suite name='Client change COMPLETED property only' ignore='yes'>
<test name='1'>
<description>Organizer invites Attendee</description>
- <request print-response='no'>
+ <request>
<method>PUT</method>
<ruri>$taskspath1:/1.ics</ruri>
<data>
@@ -1075,7 +1067,7 @@
</test>
<test name='2'>
<description>Organizer checks data</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/1.ics</ruri>
<verify>
@@ -1089,14 +1081,14 @@
</test>
<test name='3'>
<description>Attendee Inbox Item</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
</test>
<test name='4'>
<description>Attendee has data</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
@@ -1110,14 +1102,14 @@
</test>
<test name='6'>
<description>Attendee -> Completed without losing properties</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1131,7 +1123,7 @@
</test>
<test name='7'>
<description>Attendee has data - status change</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
@@ -1145,14 +1137,14 @@
</test>
<test name='8'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='9'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/1.ics</ruri>
<verify>
@@ -1166,14 +1158,14 @@
</test>
<test name='11'>
<description>Attendee -> removes Completed without losing properties</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$</ruri>
<data>
@@ -1187,7 +1179,7 @@
</test>
<test name='12'>
<description>Attendee has data - status change</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$taskspath2:/</ruri>
<verify>
@@ -1201,14 +1193,14 @@
</test>
<test name='13'>
<description>Organizer Inbox Item</description>
- <request print-response='no'>
+ <request>
<method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='14'>
<description>Organizer data changed</description>
- <request print-response='no'>
+ <request>
<method>GET</method>
<ruri>$taskspath1:/1.ics</ruri>
<verify>
@@ -1225,18 +1217,15 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$taskspath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$taskspath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$taskspath2:/</ruri>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -136,27 +136,9 @@
<test name='5'>
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>204</value>
- </arg>
- </verify>
- </request>
</test>
<test name='6'>
<description>Attendee has data</description>
@@ -221,27 +203,9 @@
<test name='9'>
<description>Organizer Inbox Item</description>
<request print-response='no'>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath1:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>204</value>
- </arg>
- </verify>
- </request>
</test>
<test name='10'>
<description>Organizer data changed</description>
@@ -274,27 +238,9 @@
<test name='12'>
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>204</value>
- </arg>
- </verify>
- </request>
</test>
<test name='13'>
<description>Attendee has data</description>
@@ -457,27 +403,9 @@
<test name='5'>
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>204</value>
- </arg>
- </verify>
- </request>
</test>
<test name='6'>
<description>Attendee has data</description>
@@ -538,27 +466,9 @@
<test name='9'>
<description>Organizer Inbox Item</description>
<request print-response='no'>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath1:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>204</value>
- </arg>
- </verify>
- </request>
</test>
<test name='10'>
<description>Organizer data changed</description>
@@ -632,27 +542,9 @@
<test name='2'>
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>204</value>
- </arg>
- </verify>
- </request>
</test>
<test name='3'>
<description>Attendee has data</description>
@@ -721,27 +613,9 @@
<test name='5'>
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>204</value>
- </arg>
- </verify>
- </request>
</test>
<test name='6'>
<description>Attendee has data</description>
@@ -835,27 +709,9 @@
<test name='9'>
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>204</value>
- </arg>
- </verify>
- </request>
</test>
<test name='10'>
<description>Attendee has data</description>
@@ -917,27 +773,9 @@
<test name='13'>
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>204</value>
- </arg>
- </verify>
- </request>
</test>
<test name='14'>
<description>Attendee has data</description>
@@ -986,6 +824,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
@@ -1011,27 +853,9 @@
<test name='2'>
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>204</value>
- </arg>
- </verify>
- </request>
</test>
<test name='3'>
<description>Attendee has data</description>
@@ -1110,6 +934,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
@@ -1224,27 +1052,9 @@
<test name='5'>
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>204</value>
- </arg>
- </verify>
- </request>
</test>
<test name='6'>
<description>Attendee has data</description>
@@ -1442,6 +1252,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
@@ -1650,27 +1464,9 @@
<test name='8'>
<description>Attendee Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>204</value>
- </arg>
- </verify>
- </request>
</test>
<test name='9'>
<description>Attendee has data</description>
@@ -1887,6 +1683,10 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$calendarpath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -505,7 +505,7 @@
<test-suite name="POSTs" ignore='no'>
<test name='1'>
<description>POST with utf-8 data</description>
- <request print-response='no'>
+ <request>
<method>POST</method>
<ruri>$outboxpath1:/</ruri>
<header>
@@ -527,7 +527,7 @@
</test>
<test name='2'>
<description>POST with non-utf-8 data</description>
- <request print-response='no'>
+ <request>
<method>POST</method>
<ruri>$outboxpath1:/</ruri>
<data>
@@ -548,7 +548,7 @@
<test-suite name="PUT with CN re-write" ignore='no'>
<test name='1'>
<description>PUT without CN</description>
- <request user="$i18nid:" pswd="$i18npswd:" print-response='no'>
+ <request user="$i18nid:" pswd="$i18npswd:" end-delete="yes">
<method>PUT</method>
<ruri>$i18ncalendarpath:/cntest.ics</ruri>
<data substitutions='yes'>
@@ -562,7 +562,7 @@
</test>
<test name='2'>
<description>Check valid CN</description>
- <request user="$i18nid:" pswd="$i18npswd:" print-response='no'>
+ <request user="$i18nid:" pswd="$i18npswd:">
<method>GET</method>
<ruri>$i18ncalendarpath:/cntest.ics</ruri>
<verify>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -661,26 +661,23 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$calendarpath3:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
+ <ruri>$calendarpath3:/</ruri>
</request>
</test>
</test-suite>
@@ -895,27 +892,16 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$calendarpath3:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
- </request>
</test>
</test-suite>
@@ -1129,27 +1115,16 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$calendarpath3:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
- </request>
</test>
</test-suite>
@@ -1291,32 +1266,23 @@
</verify>
</request>
</test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ </request>
+ </test>
</test-suite>
- <end>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$calendarpath3:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
- </request>
- </end>
+ <end/>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostmaskuid.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostmaskuid.xml 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostmaskuid.xml 2014-02-02 22:26:27 UTC (rev 12537)
@@ -56,13 +56,13 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request>
+ <method>DELAY</method>
+ <ruri>1</ruri>
+ </request>
</test>
<test name="3">
<description>Invite user 1 -> user 2</description>
- <request>
- <method>DELAY</method>
- <ruri>2</ruri>
- </request>
<request end-delete="yes">
<method>PUT</method>
<ruri>$calendarpath1:/3.ics</ruri>
@@ -74,6 +74,10 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name="4">
<description>User 2 -> accepted</description>
@@ -95,13 +99,13 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
</test>
<test name="5">
<description>Invite user 1 -> user 2</description>
- <request>
- <method>DELAY</method>
- <ruri>2</ruri>
- </request>
<request end-delete="yes">
<method>PUT</method>
<ruri>$calendarpath1:/4.ics</ruri>
@@ -113,6 +117,10 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name="6">
<description>User 2 -> accepted</description>
@@ -134,13 +142,13 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
</test>
<test name="7">
<description>Invite user 3 -> user 2</description>
- <request>
- <method>DELAY</method>
- <ruri>2</ruri>
- </request>
<request user="$userid3:" pswd="$pswd3:" end-delete="yes">
<method>PUT</method>
<ruri>$calendarpath3:/5.ics</ruri>
@@ -152,6 +160,10 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
</test>
<test name="8">
<description>User 2 -> accepted</description>
@@ -173,6 +185,10 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
</test>
</test-suite>
@@ -318,27 +334,21 @@
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
- </request>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
<ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:">
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
+ <ruri>$calendarpath3:/</ruri>
+ <ruri>$inboxpath3:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
+ <method>WAITDELETEALL 3</method>
<ruri>$inboxpath2:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
- <ruri>$calendarpath3:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
- <ruri>$inboxpath3:/</ruri>
- </request>
</end>
</caldavtest>
Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py 2014-02-02 01:11:28 UTC (rev 12536)
+++ CalDAVTester/trunk/src/caldavtest.py 2014-02-02 22:26:27 UTC (rev 12537)
@@ -395,7 +395,7 @@
def dowaitcount(self, collection, count, label=""):
- for _ignore in range(30):
+ for _ignore in range(120):
req = request(self.manager)
req.method = "PROPFIND"
req.ruris.append(collection[0])
@@ -424,7 +424,7 @@
if ctr - 1 == count:
return True
- delay = 1
+ delay = 0.25
starttime = time.time()
while (time.time() < starttime + delay):
pass
@@ -434,7 +434,7 @@
def dowaitchanged(self, uri, etag, user, pswd, label=""):
- for _ignore in range(30):
+ for _ignore in range(120):
req = request(self.manager)
req.method = "HEAD"
req.ruris.append(uri)
@@ -453,7 +453,7 @@
break
else:
return False
- delay = 1
+ delay = 0.25
starttime = time.time()
while (time.time() < starttime + delay):
pass
@@ -537,22 +537,25 @@
# Special check for WAITCOUNT
elif req.method.startswith("WAITCOUNT"):
count = int(req.method[10:])
- collection = (req.ruri, req.user, req.pswd)
- if self.dowaitcount(collection, count, label=label):
+ for ruri in req.ruris:
+ collection = (ruri, req.user, req.pswd)
+ if not self.dowaitcount(collection, count, label=label):
+ return False, "Count did not change", None, None
+ else:
return True, "", None, None
- else:
- return False, "Count did not change", None, None
# Special check for WAITDELETEALL
elif req.method.startswith("WAITDELETEALL"):
count = int(req.method[len("WAITDELETEALL"):])
- collection = (req.ruri, req.user, req.pswd)
- if self.dowaitcount(collection, count, label=label):
- hrefs = self.dofindall(collection, label="%s | %s" % (label, "DELETEALL"))
- self.dodeleteall(hrefs, label="%s | %s" % (label, "DELETEALL"))
+ for ruri in req.ruris:
+ collection = (ruri, req.user, req.pswd)
+ if self.dowaitcount(collection, count, label=label):
+ hrefs = self.dofindall(collection, label="%s | %s" % (label, "DELETEALL"))
+ self.dodeleteall(hrefs, label="%s | %s" % (label, "DELETEALL"))
+ else:
+ return False, "Count did not change", None, None
+ else:
return True, "", None, None
- else:
- return False, "Count did not change", None, None
result = True
resulttxt = ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/2fa6e5f7/attachment.html>
More information about the calendarserver-changes
mailing list