[CalendarServer-changes] [14817] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 14817
          http://trac.calendarserver.org//changeset/14817
Author:   cdaboo at apple.com
Date:     2015-05-21 22:54:19 -0700 (Thu, 21 May 2015)
Log Message:
-----------
Fix test clean-up.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_7.txt
    CalDAVTester/trunk/scripts/tests/CalDAV/caldavIOP.xml

Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_7.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_7.txt	2015-05-22 05:52:18 UTC (rev 14816)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_7.txt	2015-05-22 05:54:19 UTC (rev 14817)
@@ -21,8 +21,8 @@
 END:STANDARD
 END:VTIMEZONE
 BEGIN:VEVENT
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;PARTSTAT=DECLINED;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=$username1:;PARTSTAT=DECLINED:$cuaddr1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
 ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr3:
 DTSTAMP:20051228T232640Z
 DTSTART;TZID=US/Eastern:$now.year.1:0109T111500

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/caldavIOP.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/caldavIOP.xml	2015-05-22 05:52:18 UTC (rev 14816)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/caldavIOP.xml	2015-05-22 05:54:19 UTC (rev 14817)
@@ -68,6 +68,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</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>
 		</test>
 		<test name='1.4'>
 			<description>Create new single-instance meeting titled "Meeting 1.4" with an alarm set to trigger 15 minutes prior to the schedule time of the meeting.</description>
@@ -141,6 +149,10 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>WAITDELETEALL 1</method>
+				<ruri>$inboxpath2:/</ruri>
+			</request>
 		</test>
 		<test name='2.5'>
 			<description>Add an alarm to "Meeting 1.1bis".</description>
@@ -183,6 +195,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</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>
 		</test>
 		<test name='2.8'>
 			<description>Cancel the 4th instance of the recurring meeting created in 1.2.</description>
@@ -211,6 +231,10 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>WAITDELETEALL 1</method>
+				<ruri>$inboxpath2:/</ruri>
+			</request>
 		</test>
 	</test-suite>
 
@@ -334,27 +358,24 @@
 		<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 2</method>
+			<ruri>$inboxpath2:/</ruri>
 		</request>
+		<request user="$userid3:" pswd="$pswd3:">
+			<method>WAITDELETEALL 1</method>
+			<ruri>$inboxpath3:/</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>
 	</end>
 	
 </caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150521/7827287d/attachment-0001.html>