[CalendarServer-changes] [14819] CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml

[source_changes at macosforge.org]

Revision: 14819
          http://trac.calendarserver.org//changeset/14819
Author:   cdaboo at apple.com
Date:     2015-05-22 04:30:28 -0700 (Fri, 22 May 2015)
Log Message:
-----------
Properly clean-up after test. Make sure trash is emptied before we start.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml	2015-05-22 05:55:31 UTC (rev 14818)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml	2015-05-22 11:30:28 UTC (rev 14819)
@@ -26,7 +26,12 @@
 		<feature>trash-collection</feature>
 	</require-feature>
 
-	<start/>
+	<start>
+		<request>
+			<method>POST</method>
+			<ruri>$calendarhome1:/?action=emptytrash</ruri>
+		</request>
+	</start>
 
 	<test-suite name='Simple trashed event recovery'>
 		<test name='1'>
@@ -378,6 +383,14 @@
                 <method>DELETE</method>
                 <ruri>$calendarhome1:/tobedeleted/</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>
                 <method>POST</method>
                 <ruri>$calendarhome1:/?action=emptytrash</ruri>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150522/2092b216/attachment.html>