[CalendarServer-changes] [11793] CalDAVTester/trunk/scripts/tests/CalDAV

source_changes at macosforge.org source_changes at macosforge.org
Sun Oct 6 09:53:22 PDT 2013


Revision: 11793
          http://trac.calendarserver.org//changeset/11793
Author:   cdaboo at apple.com
Date:     2013-10-06 09:53:22 -0700 (Sun, 06 Oct 2013)
Log Message:
-----------
Use wait-for-success option for servers that refresh attendees asynchronously.

Modified Paths:
--------------
    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/implicitauto7.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitbatchrefresh.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario2.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml	2013-10-06 16:52:04 UTC (rev 11792)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml	2013-10-06 16:53:22 UTC (rev 11793)
@@ -848,7 +848,7 @@
 		</test>
 		<test name='18'>
 			<description>Attendee 2 has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
 				<method>GET</method>
 				<ruri>$attendee2_event:</ruri>
 				<verify>
@@ -1415,7 +1415,7 @@
 		</test>
 		<test name='18'>
 			<description>Attendee 2 has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
 				<method>GET</method>
 				<ruri>$attendee2_event:</ruri>
 				<verify>
@@ -1981,7 +1981,7 @@
 		</test>
 		<test name='18'>
 			<description>Attendee 2 has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
 				<method>GET</method>
 				<ruri>$attendee2_event:</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml	2013-10-06 16:52:04 UTC (rev 11792)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml	2013-10-06 16:53:22 UTC (rev 11793)
@@ -141,7 +141,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -292,7 +292,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -328,7 +328,7 @@
 		</test>
 		<test name='7' ignore='no'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -440,7 +440,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -584,7 +584,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -728,7 +728,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -872,7 +872,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1016,7 +1016,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml	2013-10-06 16:52:04 UTC (rev 11792)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml	2013-10-06 16:53:22 UTC (rev 11793)
@@ -394,7 +394,7 @@
 		</test>
 		<test name='19' ignore='no'>
 			<description>One item in resource08 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GET</method>
 				<ruri>$r2:</ruri>
 				<verify>
@@ -404,7 +404,6 @@
 						<value>Resource/CalDAV/implicit/auto10/suite1/10.ics</value>
 					</arg>
 				</verify>
-				<graburi>$r2:</graburi>
 			</request>
 		</test>
 		<test name='20' ignore='no'>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml	2013-10-06 16:52:04 UTC (rev 11792)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml	2013-10-06 16:53:22 UTC (rev 11793)
@@ -114,7 +114,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -239,7 +239,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -364,7 +364,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -489,7 +489,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -614,7 +614,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -739,7 +739,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml	2013-10-06 16:52:04 UTC (rev 11792)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml	2013-10-06 16:53:22 UTC (rev 11793)
@@ -133,7 +133,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user03 calendar</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -279,7 +279,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user03 calendar</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -425,7 +425,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user03 calendar</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -571,7 +571,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user03 calendar</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml	2013-10-06 16:52:04 UTC (rev 11792)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml	2013-10-06 16:53:22 UTC (rev 11793)
@@ -133,7 +133,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -169,7 +169,7 @@
 		</test>
 		<test name='7' ignore='no'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -209,7 +209,7 @@
 		</test>
 		<test name='9' ignore='no'>
 			<description>One item in resource02 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath2:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml	2013-10-06 16:52:04 UTC (rev 11792)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml	2013-10-06 16:53:22 UTC (rev 11793)
@@ -418,7 +418,7 @@
 		</test>
 		<test name='5' ignore='no'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitbatchrefresh.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitbatchrefresh.xml	2013-10-06 16:52:04 UTC (rev 11792)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitbatchrefresh.xml	2013-10-06 16:53:22 UTC (rev 11793)
@@ -153,16 +153,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8'>
-			<description>Wait for all refreshes</description>
-			<request print-response='no'>
-				<method>DELAY</method>
-				<ruri>20</ruri>
-			</request>
-		</test>
 		<test name='9'>
 			<description>Other attendees have data</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -173,7 +166,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath4:/</ruri>
 				<verify>
@@ -184,7 +177,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid5:" pswd="$pswd5:" print-response='no'>
+			<request user="$userid5:" pswd="$pswd5:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath5:/</ruri>
 				<verify>
@@ -195,7 +188,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid6:" pswd="$pswd6:" print-response='no'>
+			<request user="$userid6:" pswd="$pswd6:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath6:/</ruri>
 				<verify>
@@ -206,7 +199,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid7:" pswd="$pswd7:" print-response='no'>
+			<request user="$userid7:" pswd="$pswd7:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath7:/</ruri>
 				<verify>
@@ -217,7 +210,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid8:" pswd="$pswd8:" print-response='no'>
+			<request user="$userid8:" pswd="$pswd8:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath8:/</ruri>
 				<verify>
@@ -228,7 +221,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid9:" pswd="$pswd9:" print-response='no'>
+			<request user="$userid9:" pswd="$pswd9:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath9:/</ruri>
 				<verify>
@@ -239,7 +232,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid10:" pswd="$pswd10:" print-response='no'>
+			<request user="$userid10:" pswd="$pswd10:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath10:/</ruri>
 				<verify>
@@ -250,7 +243,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid11:" pswd="$pswd11:" print-response='no'>
+			<request user="$userid11:" pswd="$pswd11:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath11:/</ruri>
 				<verify>
@@ -261,7 +254,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid12:" pswd="$pswd12:" print-response='no'>
+			<request user="$userid12:" pswd="$pswd12:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath12:/</ruri>
 				<verify>
@@ -403,16 +396,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9'>
-			<description>Wait for all refreshes</description>
-			<request print-response='no'>
-				<method>DELAY</method>
-				<ruri>20</ruri>
-			</request>
-		</test>
 		<test name='10'>
 			<description>Attendees have data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -423,7 +409,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -434,7 +420,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath4:/</ruri>
 				<verify>
@@ -445,7 +431,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid5:" pswd="$pswd5:" print-response='no'>
+			<request user="$userid5:" pswd="$pswd5:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath5:/</ruri>
 				<verify>
@@ -456,7 +442,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid6:" pswd="$pswd6:" print-response='no'>
+			<request user="$userid6:" pswd="$pswd6:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath6:/</ruri>
 				<verify>
@@ -467,7 +453,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid7:" pswd="$pswd7:" print-response='no'>
+			<request user="$userid7:" pswd="$pswd7:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath7:/</ruri>
 				<verify>
@@ -478,7 +464,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid8:" pswd="$pswd8:" print-response='no'>
+			<request user="$userid8:" pswd="$pswd8:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath8:/</ruri>
 				<verify>
@@ -489,7 +475,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid9:" pswd="$pswd9:" print-response='no'>
+			<request user="$userid9:" pswd="$pswd9:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath9:/</ruri>
 				<verify>
@@ -500,7 +486,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid10:" pswd="$pswd10:" print-response='no'>
+			<request user="$userid10:" pswd="$pswd10:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath10:/</ruri>
 				<verify>
@@ -511,7 +497,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid11:" pswd="$pswd11:" print-response='no'>
+			<request user="$userid11:" pswd="$pswd11:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath11:/</ruri>
 				<verify>
@@ -522,7 +508,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid12:" pswd="$pswd12:" print-response='no'>
+			<request user="$userid12:" pswd="$pswd12:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath12:/</ruri>
 				<verify>
@@ -622,16 +608,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6'>
-			<description>Wait for first batch refresh to happen</description>
-			<request print-response='no'>
-				<method>DELAY</method>
-				<ruri>8</ruri>
-			</request>
-		</test>
 		<test name='7'>
 			<description>Attendee #3 -> Accepted</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -671,16 +650,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10'>
-			<description>Wait for all refreshes</description>
-			<request print-response='no'>
-				<method>DELAY</method>
-				<ruri>20</ruri>
-			</request>
-		</test>
 		<test name='11'>
 			<description>Attendees have data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -691,7 +663,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -702,7 +674,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath4:/</ruri>
 				<verify>
@@ -713,7 +685,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid5:" pswd="$pswd5:" print-response='no'>
+			<request user="$userid5:" pswd="$pswd5:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath5:/</ruri>
 				<verify>
@@ -724,7 +696,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid6:" pswd="$pswd6:" print-response='no'>
+			<request user="$userid6:" pswd="$pswd6:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath6:/</ruri>
 				<verify>
@@ -735,7 +707,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid7:" pswd="$pswd7:" print-response='no'>
+			<request user="$userid7:" pswd="$pswd7:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath7:/</ruri>
 				<verify>
@@ -746,7 +718,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid8:" pswd="$pswd8:" print-response='no'>
+			<request user="$userid8:" pswd="$pswd8:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath8:/</ruri>
 				<verify>
@@ -757,7 +729,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid9:" pswd="$pswd9:" print-response='no'>
+			<request user="$userid9:" pswd="$pswd9:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath9:/</ruri>
 				<verify>
@@ -768,7 +740,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid10:" pswd="$pswd10:" print-response='no'>
+			<request user="$userid10:" pswd="$pswd10:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath10:/</ruri>
 				<verify>
@@ -779,7 +751,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid11:" pswd="$pswd11:" print-response='no'>
+			<request user="$userid11:" pswd="$pswd11:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath11:/</ruri>
 				<verify>
@@ -790,7 +762,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid12:" pswd="$pswd12:" print-response='no'>
+			<request user="$userid12:" pswd="$pswd12:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath12:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario2.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario2.xml	2013-10-06 16:52:04 UTC (rev 11792)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario2.xml	2013-10-06 16:53:22 UTC (rev 11793)
@@ -277,7 +277,7 @@
 		</test>
 		<test name='11'>
 			<description>Attendee 2 data changed</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -391,7 +391,7 @@
 		</test>
 		<test name='17'>
 			<description>Attendee 1 data changed</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml	2013-10-06 16:52:04 UTC (rev 11792)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml	2013-10-06 16:53:22 UTC (rev 11793)
@@ -1116,7 +1116,7 @@
 		</test>
 		<test name='6'>
 			<description>Matching property</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response="no">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -1607,7 +1607,7 @@
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml	2013-10-06 16:52:04 UTC (rev 11792)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml	2013-10-06 16:53:22 UTC (rev 11793)
@@ -1296,7 +1296,7 @@
 		</test>
 		<test name='13'>
 			<description>Attendee 3 data changed</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$taskspath3:/</ruri>
 				<verify>
@@ -1388,7 +1388,7 @@
 		</test>
 		<test name='18'>
 			<description>Attendee 2 data changed</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$taskspath2:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml	2013-10-06 16:52:04 UTC (rev 11792)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml	2013-10-06 16:53:22 UTC (rev 11793)
@@ -295,7 +295,7 @@
 		</test>
 		<test name='11'>
 			<description>Attendee 2 data changed</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -423,7 +423,7 @@
 		</test>
 		<test name='6'>
 			<description>Attendee 2 data changed</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -559,7 +559,7 @@
 		</test>
 		<test name='6'>
 			<description>Attendee 2 data unchanged</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -695,7 +695,7 @@
 		</test>
 		<test name='6'>
 			<description>Attendee 2 data changed</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -812,7 +812,7 @@
 		</test>
 		<test name='6'>
 			<description>Attendee 1 data changed</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -929,7 +929,7 @@
 		</test>
 		<test name='6'>
 			<description>Attendee 2 data changed</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20131006/1b3447c5/attachment-0001.html>


More information about the calendarserver-changes mailing list