[CalendarServer-changes] [5749] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jun 15 18:15:42 PDT 2010
Revision: 5749
http://trac.macosforge.org/projects/calendarserver/changeset/5749
Author: cdaboo at apple.com
Date: 2010-06-15 18:15:38 -0700 (Tue, 15 Jun 2010)
Log Message:
-----------
Cannot use user01 for quota tests due to large calendars.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/Common/POST/sharinginvite234.xml
CalDAVTester/trunk/Resource/Common/POST/sharingreply23.xml
CalDAVTester/trunk/Resource/Common/POST/sharingreply24.xml
Added: CalDAVTester/trunk/Resource/Common/POST/sharinginvite234.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharinginvite234.xml (rev 0)
+++ CalDAVTester/trunk/Resource/Common/POST/sharinginvite234.xml 2010-06-16 01:15:38 UTC (rev 5749)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+ <CS:set>
+ <D:href>$cuaddr3:</D:href>
+ <CS:summary>My Shared Calendar</CS:summary>
+ <CS:read-write/>
+ </CS:set>
+ <CS:set>
+ <D:href>$cuaddr4:</D:href>
+ <CS:summary>My Shared Calendar</CS:summary>
+ <CS:read/>
+ </CS:set>
+</CS:share>
Added: CalDAVTester/trunk/Resource/Common/POST/sharingreply23.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharingreply23.xml (rev 0)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply23.xml 2010-06-16 01:15:38 UTC (rev 5749)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'>$principalurl3:</href>
+ <invite-accepted/>
+ <hosturl>
+ <href xmlns='DAV:'>$pathprefix2:/shared</href>
+ </hosturl>
+ <in-reply-to>$inviteuid3:</in-reply-to>
+ <summary>The Shared Calendar</summary>
+</invite-reply>
Added: CalDAVTester/trunk/Resource/Common/POST/sharingreply24.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharingreply24.xml (rev 0)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply24.xml 2010-06-16 01:15:38 UTC (rev 5749)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'>$principalurl4:</href>
+ <invite-accepted/>
+ <hosturl>
+ <href xmlns='DAV:'>$pathprefix2:/shared</href>
+ </hosturl>
+ <in-reply-to>$inviteuid4:</in-reply-to>
+ <summary>The Shared Calendar</summary>
+</invite-reply>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml 2010-06-16 00:42:09 UTC (rev 5748)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml 2010-06-16 01:15:38 UTC (rev 5749)
@@ -28,17 +28,21 @@
</require-feature>
<start>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$notificationpath1:/</ruri>
- </request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
</request>
- <request end-delete="yes">
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath3:/</ruri>
+ </request>
+ <request user="$userid4:" pswd="$pswd4:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath4:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>MKCALENDAR</method>
- <ruri>$pathprefix1:/shared/</ruri>
+ <ruri>$pathprefix2:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
@@ -52,12 +56,12 @@
<test-suite name='Setup two sharees'>
<test name='1' ignore='no'>
<description>POST invitation</description>
- <request print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>POST</method>
- <ruri>$pathprefix1:/shared/</ruri>
+ <ruri>$pathprefix2:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/POST/sharinginvite23.xml</filepath>
+ <filepath>Resource/Common/POST/sharinginvite234.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -66,82 +70,78 @@
</test>
<test name='2'>
<description>Check Sharee 2 notification collection</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>WAITCOUNT 1</method>
- <ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>GETNEW</method>
- <ruri>$notificationpath2:/</ruri>
+ <ruri>$notificationpath3:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
<grabelement>
<name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
- <variable>$inviteuid2:</variable>
+ <variable>$inviteuid3:</variable>
</grabelement>
</request>
</test>
<test name='3'>
<description>Sharee 2 replies ACCEPTED</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>POST</method>
- <ruri>$pathprefix2:/</ruri>
+ <ruri>$pathprefix3:/</ruri>
<data substitutions='yes'>
<content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/POST/sharingreply2.xml</filepath>
+ <filepath>Resource/Common/POST/sharingreply23.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
</verify>
<grabelement>
<name>{DAV:}href</name>
- <variable>$shareecalendar2:</variable>
+ <variable>$shareecalendar3:</variable>
</grabelement>
</request>
</test>
<test name='4'>
<description>Check Sharee 3 notification collection</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
<method>WAITCOUNT 1</method>
- <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
<method>GETNEW</method>
- <ruri>$notificationpath3:/</ruri>
+ <ruri>$notificationpath4:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
<grabelement>
<name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
- <variable>$inviteuid3:</variable>
+ <variable>$inviteuid4:</variable>
</grabelement>
</request>
</test>
<test name='5'>
<description>Sharee 3 replies ACCEPTED</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
<method>POST</method>
- <ruri>$pathprefix3:/</ruri>
+ <ruri>$pathprefix4:/</ruri>
<data substitutions='yes'>
<content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/POST/sharingreply3.xml</filepath>
+ <filepath>Resource/Common/POST/sharingreply24.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
</verify>
<grabelement>
<name>{DAV:}href</name>
- <variable>$shareecalendar3:</variable>
+ <variable>$shareecalendar4:</variable>
</grabelement>
</request>
</test>
<test name='6'>
<description>Clean out notifications</description>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$notificationpath1:/</ruri>
- </request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
@@ -150,15 +150,19 @@
<method>DELETEALL</method>
<ruri>$notificationpath3:/</ruri>
</request>
+ <request user="$userid4:" pswd="$pswd4:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath4:/</ruri>
+ </request>
</test>
</test-suite>
<test-suite name='Empty quota for all' ignore='no'>
<test name='1' ignore='no'>
- <description>User 1</description>
- <request print-response='no'>
+ <description>User 2</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/</ruri>
+ <ruri>$pathprefix2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -178,10 +182,10 @@
</request>
</test>
<test name='2' ignore='no'>
- <description>User 2</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>User 3</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/</ruri>
+ <ruri>$pathprefix3:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -201,10 +205,10 @@
</request>
</test>
<test name='3' ignore='no'>
- <description>User 3</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <description>User 4</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/</ruri>
+ <ruri>$pathprefix4:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -224,10 +228,10 @@
</request>
</test>
<test name='4' ignore='no'>
- <description>User 1</description>
- <request print-response='no'>
+ <description>User 2</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/shared/</ruri>
+ <ruri>$pathprefix2:/shared/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -247,10 +251,10 @@
</request>
</test>
<test name='5' ignore='no'>
- <description>User 2</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>User 3</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$shareecalendar2:/</ruri>
+ <ruri>$shareecalendar3:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -270,10 +274,10 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>User 3</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <description>User 4</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$shareecalendar3:/</ruri>
+ <ruri>$shareecalendar4:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -294,12 +298,12 @@
</test>
</test-suite>
- <test-suite name='PUT by User 1' ignore='no'>
+ <test-suite name='PUT by User 2' ignore='no'>
<test name='1'>
- <description>PUT by user 1</description>
- <request>
+ <description>PUT by user 2</description>
+ <request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
- <ruri>$pathprefix1:/shared/1.ics</ruri>
+ <ruri>$pathprefix2:/shared/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/sharing/quota/1.ics</filepath>
@@ -311,9 +315,9 @@
</test>
<test name='2' ignore='no'>
<description>User 1</description>
- <request print-response='no'>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/</ruri>
+ <ruri>$pathprefix2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -333,10 +337,10 @@
</request>
</test>
<test name='3' ignore='no'>
- <description>User 2</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>User 3</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/</ruri>
+ <ruri>$pathprefix3:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -356,10 +360,10 @@
</request>
</test>
<test name='4' ignore='no'>
- <description>User 3</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <description>User 4</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/</ruri>
+ <ruri>$pathprefix4:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -379,10 +383,10 @@
</request>
</test>
<test name='5' ignore='no'>
- <description>User 1</description>
- <request print-response='no'>
+ <description>User 2</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/shared/</ruri>
+ <ruri>$pathprefix2:/shared/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -402,10 +406,10 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>User 2</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>User 3</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$shareecalendar2:/</ruri>
+ <ruri>$shareecalendar3:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -425,10 +429,10 @@
</request>
</test>
<test name='7' ignore='no'>
- <description>User 3</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <description>User 4</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$shareecalendar3:/</ruri>
+ <ruri>$shareecalendar4:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -449,12 +453,12 @@
</test>
</test-suite>
- <test-suite name='PUT by User 2' ignore='no'>
+ <test-suite name='PUT by User 3' ignore='no'>
<test name='1'>
- <description>PUT by user 2</description>
- <request user="$userid2:" pswd="$pswd2:" >
+ <description>PUT by user 3</description>
+ <request user="$userid3:" pswd="$pswd3:" >
<method>PUT</method>
- <ruri>$shareecalendar2:/2.ics</ruri>
+ <ruri>$shareecalendar3:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/sharing/quota/2.ics</filepath>
@@ -465,10 +469,10 @@
</request>
</test>
<test name='2' ignore='no'>
- <description>User 1</description>
- <request print-response='no'>
+ <description>User 2</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/</ruri>
+ <ruri>$pathprefix2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -488,10 +492,10 @@
</request>
</test>
<test name='3' ignore='no'>
- <description>User 2</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>User 3</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/</ruri>
+ <ruri>$pathprefix3:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -511,10 +515,10 @@
</request>
</test>
<test name='4' ignore='no'>
- <description>User 3</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <description>User 4</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/</ruri>
+ <ruri>$pathprefix4:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -534,10 +538,10 @@
</request>
</test>
<test name='5' ignore='no'>
- <description>User 1</description>
- <request print-response='no'>
+ <description>User 2</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/shared/</ruri>
+ <ruri>$pathprefix2:/shared/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -557,10 +561,10 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>User 2</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>User 3</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$shareecalendar2:/</ruri>
+ <ruri>$shareecalendar3:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -580,10 +584,10 @@
</request>
</test>
<test name='7' ignore='no'>
- <description>User 3</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <description>User 4</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$shareecalendar3:/</ruri>
+ <ruri>$shareecalendar4:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -604,22 +608,22 @@
</test>
</test-suite>
- <test-suite name='DELETE by User 2' ignore='no'>
+ <test-suite name='DELETE by User 3' ignore='no'>
<test name='1'>
- <description>DELETE by user 2</description>
- <request user="$userid2:" pswd="$pswd2:">
+ <description>DELETE by user 3</description>
+ <request user="$userid3:" pswd="$pswd3:">
<method>DELETE</method>
- <ruri>$shareecalendar2:/1.ics</ruri>
+ <ruri>$shareecalendar3:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
</test>
<test name='2' ignore='no'>
- <description>User 1</description>
- <request print-response='no'>
+ <description>User 2</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/</ruri>
+ <ruri>$pathprefix2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -639,10 +643,10 @@
</request>
</test>
<test name='3' ignore='no'>
- <description>User 2</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>User 3</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/</ruri>
+ <ruri>$pathprefix3:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -662,10 +666,10 @@
</request>
</test>
<test name='4' ignore='no'>
- <description>User 3</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <description>User 4</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/</ruri>
+ <ruri>$pathprefix4:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -685,10 +689,10 @@
</request>
</test>
<test name='5' ignore='no'>
- <description>User 1</description>
- <request print-response='no'>
+ <description>User 2</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/shared/</ruri>
+ <ruri>$pathprefix2:/shared/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -708,10 +712,10 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>User 2</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>User 3</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$shareecalendar2:/</ruri>
+ <ruri>$shareecalendar3:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -731,10 +735,10 @@
</request>
</test>
<test name='7' ignore='no'>
- <description>User 3</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <description>User 4</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$shareecalendar3:/</ruri>
+ <ruri>$shareecalendar4:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -755,22 +759,22 @@
</test>
</test-suite>
- <test-suite name='DELETE by User 1' ignore='no'>
+ <test-suite name='DELETE by User 2' ignore='no'>
<test name='1'>
- <description>DELETE by user 1</description>
- <request>
+ <description>DELETE by user 2</description>
+ <request user="$userid2:" pswd="$pswd2:">
<method>DELETE</method>
- <ruri>$pathprefix1:/shared/2.ics</ruri>
+ <ruri>$pathprefix2:/shared/2.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
</test>
<test name='2' ignore='no'>
- <description>User 1</description>
- <request print-response='no'>
+ <description>User 2</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/</ruri>
+ <ruri>$pathprefix2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -790,10 +794,10 @@
</request>
</test>
<test name='3' ignore='no'>
- <description>User 2</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>User 3</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix2:/</ruri>
+ <ruri>$pathprefix3:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -813,10 +817,10 @@
</request>
</test>
<test name='4' ignore='no'>
- <description>User 3</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <description>User 4</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix3:/</ruri>
+ <ruri>$pathprefix4:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -836,10 +840,10 @@
</request>
</test>
<test name='5' ignore='no'>
- <description>User 1</description>
- <request print-response='no'>
+ <description>User 2</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$pathprefix1:/shared/</ruri>
+ <ruri>$pathprefix2:/shared/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -859,10 +863,10 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>User 2</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>User 3</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$shareecalendar2:/</ruri>
+ <ruri>$shareecalendar3:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -882,10 +886,10 @@
</request>
</test>
<test name='7' ignore='no'>
- <description>User 3</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <description>User 4</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$shareecalendar3:/</ruri>
+ <ruri>$shareecalendar4:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -907,10 +911,6 @@
</test-suite>
<end>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$notificationpath1:/</ruri>
- </request>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
@@ -919,6 +919,10 @@
<method>DELETEALL</method>
<ruri>$notificationpath3:/</ruri>
</request>
+ <request user="$userid4:" pswd="$pswd4:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath4:/</ruri>
+ </request>
</end>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100615/b5190124/attachment-0001.html>
More information about the calendarserver-changes
mailing list