[CalendarServer-changes] [12704] CalDAVTester/trunk/scripts/tests/CalDAV
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:16:42 PDT 2014
Revision: 12704
http://trac.calendarserver.org//changeset/12704
Author: cdaboo at apple.com
Date: 2014-02-14 12:22:20 -0800 (Fri, 14 Feb 2014)
Log Message:
-----------
More async scheduling script fixes.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/implicitallday.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto11.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.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/implicitdefaultcalendar.xml
CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitallday.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitallday.xml 2014-02-14 18:13:25 UTC (rev 12703)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitallday.xml 2014-02-14 20:22:20 UTC (rev 12704)
@@ -228,13 +228,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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>
@@ -430,13 +429,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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/implicitattendeedelete.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml 2014-02-14 18:13:25 UTC (rev 12703)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml 2014-02-14 20:22:20 UTC (rev 12704)
@@ -395,22 +395,20 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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>WAITCOUNT 1</method>
+ <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>
@@ -816,22 +814,20 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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>WAITCOUNT 1</method>
+ <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>
@@ -1233,22 +1229,20 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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>WAITCOUNT 1</method>
+ <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>
@@ -1631,22 +1625,20 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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>WAITCOUNT 1</method>
+ <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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml 2014-02-14 18:13:25 UTC (rev 12703)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml 2014-02-14 20:22:20 UTC (rev 12704)
@@ -421,13 +421,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto11.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto11.xml 2014-02-14 18:13:25 UTC (rev 12703)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto11.xml 2014-02-14 20:22:20 UTC (rev 12704)
@@ -246,12 +246,11 @@
<ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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="$useradmin:" pswd="$pswdadmin:">
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml 2014-02-14 18:13:25 UTC (rev 12703)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml 2014-02-14 20:22:20 UTC (rev 12704)
@@ -707,12 +707,11 @@
<ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 6</method>
+ <method>WAITDELETEALL 6</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:">
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml 2014-02-14 18:13:25 UTC (rev 12703)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml 2014-02-14 20:22:20 UTC (rev 12704)
@@ -501,12 +501,11 @@
<ruri>$calendarpath2:/</ruri>
</request>
<request user="$userid3:" pswd="$pswd3:">
- <method>WAITCOUNT 4</method>
+ <method>WAITDELETEALL 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:">
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomodes.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomodes.xml 2014-02-14 18:13:25 UTC (rev 12703)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomodes.xml 2014-02-14 20:22:20 UTC (rev 12704)
@@ -152,12 +152,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath5:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath5:/</ruri>
<ruri>$rinboxpath5:/</ruri>
</request>
</test>
@@ -265,12 +264,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath5:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath5:/</ruri>
<ruri>$rinboxpath5:/</ruri>
</request>
</test>
@@ -374,12 +372,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath5:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath5:/</ruri>
<ruri>$rinboxpath5:/</ruri>
</request>
</test>
@@ -483,12 +480,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath6:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath6:/</ruri>
<ruri>$rinboxpath6:/</ruri>
</request>
</test>
@@ -592,12 +588,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath6:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath6:/</ruri>
<ruri>$rinboxpath6:/</ruri>
</request>
</test>
@@ -701,12 +696,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath6:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath6:/</ruri>
<ruri>$rinboxpath6:/</ruri>
</request>
</test>
@@ -810,12 +804,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath7:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath7:/</ruri>
<ruri>$rinboxpath7:/</ruri>
</request>
</test>
@@ -919,12 +912,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath7:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath6:/</ruri>
<ruri>$rinboxpath6:/</ruri>
</request>
</test>
@@ -1028,12 +1020,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath7:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath6:/</ruri>
<ruri>$rinboxpath6:/</ruri>
</request>
</test>
@@ -1137,12 +1128,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath8:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath8:/</ruri>
<ruri>$rinboxpath8:/</ruri>
</request>
</test>
@@ -1246,12 +1236,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath8:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath8:/</ruri>
<ruri>$rinboxpath8:/</ruri>
</request>
</test>
@@ -1340,12 +1329,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath8:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath8:/</ruri>
<ruri>$rinboxpath8:/</ruri>
</request>
</test>
@@ -1449,12 +1437,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath9:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath9:/</ruri>
<ruri>$rinboxpath9:/</ruri>
</request>
</test>
@@ -1558,12 +1545,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath9:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath9:/</ruri>
<ruri>$rinboxpath9:/</ruri>
</request>
</test>
@@ -1667,12 +1653,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath9:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath9:/</ruri>
<ruri>$rinboxpath9:/</ruri>
</request>
</test>
@@ -1776,12 +1761,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath10:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath10:/</ruri>
<ruri>$rinboxpath10:/</ruri>
</request>
</test>
@@ -1885,12 +1869,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath10:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath10:/</ruri>
<ruri>$rinboxpath10:/</ruri>
</request>
</test>
@@ -1994,12 +1977,11 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$rcalendarpath10:/</ruri>
</request>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$rcalendarpath10:/</ruri>
<ruri>$rinboxpath10:/</ruri>
</request>
</test>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml 2014-02-14 18:13:25 UTC (rev 12703)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml 2014-02-14 20:22:20 UTC (rev 12704)
@@ -216,12 +216,11 @@
<ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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="$useradmin:" pswd="$pswdadmin:">
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml 2014-02-14 18:13:25 UTC (rev 12703)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml 2014-02-14 20:22:20 UTC (rev 12704)
@@ -426,12 +426,11 @@
<ruri>$calendarpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 3</method>
+ <method>WAITDELETEALL 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:">
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitbadclients.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitbadclients.xml 2014-02-14 18:13:25 UTC (rev 12703)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitbadclients.xml 2014-02-14 20:22:20 UTC (rev 12704)
@@ -151,13 +151,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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>
@@ -276,13 +275,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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/implicitdefaultcalendar.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitdefaultcalendar.xml 2014-02-14 18:13:25 UTC (rev 12703)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitdefaultcalendar.xml 2014-02-14 20:22:20 UTC (rev 12704)
@@ -393,16 +393,9 @@
<test name='4'>
<description>Attendee Inbox Item</description>
<request user="$userid10:" pswd="$pswd10:" print-response='no'>
- <method>WAITCOUNT 1</method>
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath10:/</ruri>
</request>
- <request user="$userid10:" pswd="$pswd10:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$inboxpath10:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
</test>
<test name='5'>
<description>Attendee has calendar</description>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml 2014-02-14 18:13:25 UTC (rev 12703)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml 2014-02-14 20:22:20 UTC (rev 12704)
@@ -824,13 +824,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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>
@@ -934,13 +933,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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>
@@ -1252,13 +1250,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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>
@@ -1683,13 +1680,12 @@
<ruri>$inboxpath1:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
+ <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>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/9537dbd9/attachment.html>
More information about the calendarserver-changes
mailing list