[CalendarServer-changes] [14690] CalDAVTester/trunk/scripts
source_changes at macosforge.org
source_changes at macosforge.org
Mon Apr 20 17:00:28 PDT 2015
Revision: 14690
http://trac.calendarserver.org//changeset/14690
Author: sagen at apple.com
Date: 2015-04-20 17:00:28 -0700 (Mon, 20 Apr 2015)
Log Message:
-----------
When trash-collection is enabled, empty trash in order to update quota usage; also ignore the fact attachments are still around until the associated trashed events are completely deleted
Modified Paths:
--------------
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-quota.xml
CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-recurrence.xml
CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml
CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml
CalDAVTester/trunk/scripts/tests/CalDAV/quota.xml
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-04-20 18:35:33 UTC (rev 14689)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-04-21 00:00:28 UTC (rev 14690)
@@ -111,6 +111,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>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/managed-attachments-quota.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-quota.xml 2015-04-20 18:35:33 UTC (rev 14689)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-quota.xml 2015-04-21 00:00:28 UTC (rev 14690)
@@ -28,8 +28,16 @@
<feature>quota</feature>
</require-feature>
- <start/>
-
+ <start>
+ <request user="$userid1:" pswd="$pswd1:">
+ <require-feature>
+ <feature>trash-collection</feature>
+ </require-feature>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=emptytrash</ruri>
+ </request>
+ </start>
+
<test-suite name='Simple non-recurring, non-scheduled add attachment no prefer'>
<test name='1'>
<description>Quota check</description>
@@ -245,6 +253,13 @@
</test>
<test name='9'>
<description>Quota check</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <require-feature>
+ <feature>trash-collection</feature>
+ </require-feature>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=emptytrash</ruri>
+ </request>
<request>
<exclude-feature>
<feature>quota-on-resources</feature>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-recurrence.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-recurrence.xml 2015-04-20 18:35:33 UTC (rev 14689)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-recurrence.xml 2015-04-21 00:00:28 UTC (rev 14690)
@@ -28,7 +28,7 @@
</require-feature>
<start/>
-
+
<test-suite name='Cannot add attachment to instance'>
<test name='1'>
<description>PUT event</description>
@@ -309,6 +309,9 @@
</test>
<test name='7'>
<description>Check for attachment</description>
+ <exclude-feature>
+ <feature>trash-collection</feature>
+ </exclude-feature>
<request>
<method>GET</method>
<ruri>$location:</ruri>
@@ -323,6 +326,9 @@
</test>
<test name='8'>
<description>Check for attachment</description>
+ <exclude-feature>
+ <feature>trash-collection</feature>
+ </exclude-feature>
<request>
<method>GET</method>
<ruri>$location2:</ruri>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml 2015-04-20 18:35:33 UTC (rev 14689)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml 2015-04-21 00:00:28 UTC (rev 14690)
@@ -101,7 +101,7 @@
</grabelement>
</request>
</start>
-
+
<test-suite name='Sharer add attachment'>
<test name='1'>
<description>PUT event</description>
@@ -1099,6 +1099,10 @@
</test>
<test name='11'>
<description>Check for attachment - sharer</description>
+ <exclude-feature>
+ <feature>trash-collection</feature>
+ </exclude-feature>
+
<request>
<method>GET</method>
<ruri>$location:</ruri>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml 2015-04-20 18:35:33 UTC (rev 14689)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml 2015-04-21 00:00:28 UTC (rev 14690)
@@ -28,7 +28,7 @@
</require-feature>
<start/>
-
+
<test-suite name='OPTIONS header'>
<test name='1'>
<description>Look for options header tag on principal</description>
@@ -631,6 +631,9 @@
</test>
<test name='5'>
<description>Check for attachment</description>
+ <exclude-feature>
+ <feature>trash-collection</feature>
+ </exclude-feature>
<request>
<method>GET</method>
<ruri>$location:</ruri>
@@ -1015,6 +1018,9 @@
</test>
<test name='8'>
<description>Check for attachment</description>
+ <exclude-feature>
+ <feature>trash-collection</feature>
+ </exclude-feature>
<request>
<method>GET</method>
<ruri>$location:</ruri>
@@ -1223,6 +1229,9 @@
</test>
<test name='7'>
<description>Check for attachment</description>
+ <exclude-feature>
+ <feature>trash-collection</feature>
+ </exclude-feature>
<request>
<method>GET</method>
<ruri>$location:</ruri>
@@ -1237,6 +1246,9 @@
</test>
<test name='8'>
<description>Check for attachment</description>
+ <exclude-feature>
+ <feature>trash-collection</feature>
+ </exclude-feature>
<request>
<method>GET</method>
<ruri>$location2:</ruri>
@@ -1452,6 +1464,9 @@
</test>
<test name='8'>
<description>Check for attachment</description>
+ <exclude-feature>
+ <feature>trash-collection</feature>
+ </exclude-feature>
<request>
<method>GET</method>
<ruri>$location:</ruri>
@@ -1698,6 +1713,9 @@
</test>
<test name='9'>
<description>Check for attachment</description>
+ <exclude-feature>
+ <feature>trash-collection</feature>
+ </exclude-feature>
<request>
<method>GET</method>
<ruri>$attach1:</ruri>
@@ -1996,6 +2014,9 @@
</test>
<test name='10'>
<description>Check for attachment</description>
+ <exclude-feature>
+ <feature>trash-collection</feature>
+ </exclude-feature>
<request>
<method>GET</method>
<ruri>$attach2:</ruri>
@@ -2020,6 +2041,9 @@
</test>
<test name='12'>
<description>Check for attachment</description>
+ <exclude-feature>
+ <feature>trash-collection</feature>
+ </exclude-feature>
<request>
<method>GET</method>
<ruri>$location:</ruri>
@@ -2033,6 +2057,9 @@
</request>
</test>
<test name='13'>
+ <exclude-feature>
+ <feature>trash-collection</feature>
+ </exclude-feature>
<description>Check for attachment</description>
<request>
<method>GET</method>
@@ -2566,6 +2593,9 @@
</test>
<test name='7'>
<description>Check for attachment</description>
+ <exclude-feature>
+ <feature>trash-collection</feature>
+ </exclude-feature>
<request>
<method>GET</method>
<ruri>$location:</ruri>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/quota.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/quota.xml 2015-04-20 18:35:33 UTC (rev 14689)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/quota.xml 2015-04-21 00:00:28 UTC (rev 14690)
@@ -27,11 +27,18 @@
</require-feature>
<start/>
-
+
<test-suite name='Quota enabled by default on calendar home and below only'>
<test name='1'>
<description>props on /calendars/</description>
<request user="$userid2:" pswd="$pswd2:">
+ <require-feature>
+ <feature>trash-collection</feature>
+ </require-feature>
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=emptytrash</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$calendars:</ruri>
<header>
@@ -630,5 +637,5 @@
<ruri>$inboxpath3:/</ruri>
</request>
</end>
-
+
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150420/7833dbdd/attachment-0001.html>
More information about the calendarserver-changes
mailing list