[CalendarServer-changes] [6413] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Oct 11 12:10:43 PDT 2010
Revision: 6413
http://trac.macosforge.org/projects/calendarserver/changeset/6413
Author: cdaboo at apple.com
Date: 2010-10-11 12:10:41 -0700 (Mon, 11 Oct 2010)
Log Message:
-----------
Make sure we properly clean-up after tests.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-webcal.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-peruser-properties.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/setupproxies/3.xml
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/setupproxies/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/setupproxies/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/setupproxies/3.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set/>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -444,6 +444,14 @@
</test>
</test-suite>
- <end/>
+ <end>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ <ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
+ </request>
+ </end>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -166,14 +166,13 @@
</test-suite>
<end>
- <request user="$userid1:" pswd="$pswd1:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$notificationpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
</request>
</end>
-
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -330,14 +330,13 @@
</test-suite>
<end>
- <request user="$userid1:" pswd="$pswd1:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$notificationpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
</request>
</end>
-
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -933,6 +933,14 @@
</test>
</test-suite>
- <end/>
-
+ <end>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ <ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
+ </request>
+ </end>
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -695,18 +695,13 @@
</test-suite>
<end>
- <request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$notificationpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
<ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
</request>
</end>
-
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -385,14 +385,13 @@
</test-suite>
<end>
- <request user="$userid1:" pswd="$pswd1:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$notificationpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
</request>
</end>
-
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -542,14 +542,29 @@
</test-suite>
<end>
- <request user="$userid1:" pswd="$pswd1:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$notificationpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
</request>
+ <request user="$userid2:" pswd="$pswd2:" print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/proxies/setupproxies/3.xml</filepath>
+ </data>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/proxies/setupproxies/3.xml</filepath>
+ </data>
+ </request>
</end>
-
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -911,18 +911,13 @@
</test-suite>
<end>
- <request user="$userid2:" pswd="$pswd2:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
<ruri>$notificationpath2:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
<ruri>$notificationpath3:/</ruri>
- </request>
- <request user="$userid4:" pswd="$pswd4:">
- <method>DELETEALL</method>
<ruri>$notificationpath4:/</ruri>
</request>
</end>
-
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -277,14 +277,13 @@
</test-suite>
<end>
- <request user="$userid1:" pswd="$pswd1:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$notificationpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
</request>
</end>
-
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -242,14 +242,13 @@
</test-suite>
<end>
- <request user="$userid1:" pswd="$pswd1:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$notificationpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
</request>
</end>
-
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-webcal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-webcal.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-webcal.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -476,18 +476,13 @@
</test-suite>
<end>
- <request user="$userid1:" pswd="$pswd1:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$notificationpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
- </request>
- <request user="$userid3:" pswd="$pswd3:">
- <method>DELETEALL</method>
<ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
</request>
</end>
-
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -393,7 +393,7 @@
</request>
</test>
<test name='8'>
- <description>Sharee canoot change vcard</description>
+ <description>Sharee cannot change vcard</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PUT</method>
<ruri>$sharedaddressbook:/4.vcf</ruri>
@@ -412,6 +412,14 @@
</test>
</test-suite>
- <end/>
-
+ <end>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ <ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
+ </request>
+ </end>
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-peruser-properties.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-peruser-properties.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -409,14 +409,13 @@
</test-suite>
<end>
- <request user="$userid1:" pswd="$pswd1:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$notificationpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
</request>
</end>
-
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -277,14 +277,13 @@
</test-suite>
<end>
- <request user="$userid1:" pswd="$pswd1:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$notificationpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
</request>
</end>
-
+
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml 2010-10-11 17:34:52 UTC (rev 6412)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml 2010-10-11 19:10:41 UTC (rev 6413)
@@ -242,14 +242,13 @@
</test-suite>
<end>
- <request user="$userid1:" pswd="$pswd1:">
+ <request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$notificationpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
</request>
</end>
-
+
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101011/531f7fc4/attachment-0001.html>
More information about the calendarserver-changes
mailing list