[CalendarServer-changes] [14827] CalDAVTester/trunk/scripts
source_changes at macosforge.org
source_changes at macosforge.org
Tue May 26 15:58:41 PDT 2015
Revision: 14827
http://trac.calendarserver.org//changeset/14827
Author: sagen at apple.com
Date: 2015-05-26 15:58:41 -0700 (Tue, 26 May 2015)
Log Message:
-----------
Empty user02's trash after testing
Modified Paths:
--------------
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-05-26 16:50:49 UTC (rev 14826)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-05-26 22:58:41 UTC (rev 14827)
@@ -23,6 +23,7 @@
<nonsslport>8008</nonsslport>
<sslport>8443</sslport>
<authtype>basic</authtype>
+ <!-- <unix>/tmp/caldavd_requests/unsecured.sock</unix> -->
<waitcount>120</waitcount>
<waitdelay>0.25</waitdelay>
@@ -111,7 +112,7 @@
<feature>timezones-by-reference</feature> <!-- Timezones by reference enabled -->
<feature>timezone-service</feature> <!-- Timezone service extension for Wiki -->
<feature>timezone-std-service</feature> <!-- Timezone standard service extension -->
- <!-- <feature>trash-collection</feature> --> <!-- Trash collection enabled -->
+ <!-- <feature>trash-collection</feature> --> <!-- Trash collection enabled -->
<feature>travel-time-busy</feature> <!-- Travel time appears as busy -->
<feature>vavailability</feature> <!-- VAVAILABILITY on inbox -->
<!-- <feature>vpoll</feature> --> <!-- VPOLL support for store and scheduling -->
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml 2015-05-26 16:50:49 UTC (rev 14826)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml 2015-05-26 22:58:41 UTC (rev 14827)
@@ -31,6 +31,10 @@
<method>POST</method>
<ruri>$calendarhome1:/?action=emptytrash</ruri>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=emptytrash</ruri>
+ </request>
</start>
<test-suite name='Simple trashed event recovery'>
@@ -78,19 +82,21 @@
</arg>
</verify>
</request>
- <request>
- <method>DELETEALL</method>
- <ruri>$calendarhome1:/tobedeleted/</ruri>
- </request>
- <request>
- <method>DELETE</method>
- <ruri>$calendarhome1:/tobedeleted/</ruri>
- </request>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/?action=emptytrash</ruri>
- </request>
</test>
+ <test name='clean up'>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ </request>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ </request>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=emptytrash</ruri>
+ </request>
+ </test>
</test-suite>
@@ -232,21 +238,20 @@
</verify>
</request>
</test>
- <test name='10'>
- <description>Clean up</description>
+ <test name='clean up'>
<request>
- <method>DELETEALL</method>
- <ruri>$calendarhome1:/tobedeleted/</ruri>
- </request>
- <request>
- <method>DELETE</method>
- <ruri>$calendarhome1:/tobedeleted/</ruri>
- </request>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/?action=emptytrash</ruri>
- </request>
- </test>
+ <method>DELETEALL</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ </request>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ </request>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=emptytrash</ruri>
+ </request>
+ </test>
</test-suite>
<test-suite name='Organizer trashes event'>
@@ -373,8 +378,7 @@
</verify>
</request>
</test>
- <test name='13'>
- <description>Clean up</description>
+ <test name='clean up'>
<request>
<method>DELETEALL</method>
<ruri>$calendarhome1:/tobedeleted/</ruri>
@@ -395,6 +399,10 @@
<method>POST</method>
<ruri>$calendarhome1:/?action=emptytrash</ruri>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=emptytrash</ruri>
+ </request>
</test>
</test-suite>
@@ -483,7 +491,6 @@
</verify>
</request>
</test>
-
<test name='9'>
<description>Attendee recovers trash</description>
<request>
@@ -512,8 +519,7 @@
</verify>
</request>
</test>
- <test name='12'>
- <description>Clean up</description>
+ <test name='clean up'>
<request>
<method>DELETEALL</method>
<ruri>$calendarhome1:/tobedeleted/</ruri>
@@ -534,9 +540,14 @@
<method>POST</method>
<ruri>$calendarhome1:/?action=emptytrash</ruri>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=emptytrash</ruri>
+ </request>
</test>
+
</test-suite>
- <end/>
+ <end/>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150526/63dd04ac/attachment.html>
More information about the calendarserver-changes
mailing list