[CalendarServer-changes] [12168] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:21:18 PDT 2014
Revision: 12168
http://trac.calendarserver.org//changeset/12168
Author: cdaboo at apple.com
Date: 2013-12-20 08:15:14 -0800 (Fri, 20 Dec 2013)
Log Message:
-----------
Checkpoint: cross-pod dropbox.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-dropbox.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/Common/POST/sharinginvite234-pod.xml
CalDAVTester/trunk/Resource/Common/POST/sharingreply23-pod.xml
CalDAVTester/trunk/Resource/Common/POST/sharingreply24-pod.xml
Added: CalDAVTester/trunk/Resource/Common/POST/sharinginvite234-pod.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharinginvite234-pod.xml (rev 0)
+++ CalDAVTester/trunk/Resource/Common/POST/sharinginvite234-pod.xml 2013-12-20 16:15:14 UTC (rev 12168)
@@ -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>$pcuaddr3:</D:href>
+ <CS:summary>My Shared Calendar</CS:summary>
+ <CS:read-write/>
+ </CS:set>
+ <CS:set>
+ <D:href>$pcuaddr4:</D:href>
+ <CS:summary>My Shared Calendar</CS:summary>
+ <CS:read/>
+ </CS:set>
+</CS:share>
Added: CalDAVTester/trunk/Resource/Common/POST/sharingreply23-pod.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharingreply23-pod.xml (rev 0)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply23-pod.xml 2013-12-20 16:15:14 UTC (rev 12168)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'>mailto:$pemail3:</href>
+ <invite-accepted/>
+ <hosturl>
+ <href xmlns='DAV:'>$hosturl23:</href>
+ </hosturl>
+ <in-reply-to>$inviteuid23:</in-reply-to>
+ <summary>The Shared Calendar</summary>
+ <common-name>$pusername3:</common-name>
+ <first-name>$pfirstname3:</first-name>
+ <last-name>$plastname3:</last-name>
+</invite-reply>
Added: CalDAVTester/trunk/Resource/Common/POST/sharingreply24-pod.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/sharingreply24-pod.xml (rev 0)
+++ CalDAVTester/trunk/Resource/Common/POST/sharingreply24-pod.xml 2013-12-20 16:15:14 UTC (rev 12168)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'>mailto:$pemail4:</href>
+ <invite-accepted/>
+ <hosturl>
+ <href xmlns='DAV:'>$hosturl24:</href>
+ </hosturl>
+ <in-reply-to>$inviteuid24:</in-reply-to>
+ <summary>The Shared Calendar</summary>
+ <common-name>$pusername4:</common-name>
+ <first-name>$pfirstname4:</first-name>
+ <last-name>$plastname4:</last-name>
+</invite-reply>
Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-dropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-dropbox.xml 2013-12-20 16:02:05 UTC (rev 12167)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-dropbox.xml 2013-12-20 16:15:14 UTC (rev 12168)
@@ -32,13 +32,13 @@
<method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
+ <request host2="yes" user="$puserid3:" pswd="$ppswd3:">
<method>DELETEALL</method>
- <ruri>$notificationpath3:/</ruri>
+ <ruri>$pnotificationpath3:/</ruri>
</request>
- <request user="$userid4:" pswd="$pswd4:">
+ <request host2="yes" user="$puserid4:" pswd="$ppswd4:">
<method>DELETEALL</method>
- <ruri>$notificationpath4:/</ruri>
+ <ruri>$pnotificationpath4:/</ruri>
</request>
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>MKCALENDAR</method>
@@ -57,7 +57,7 @@
<ruri>$calendarhome2:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/POST/sharinginvite234.xml</filepath>
+ <filepath>Resource/Common/POST/sharinginvite234-pod.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -66,13 +66,13 @@
</test>
<test name='2'>
<description>Check Sharee 2 notification collection</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
<method>WAITCOUNT 1</method>
- <ruri>$notificationpath3:/</ruri>
+ <ruri>$pnotificationpath3:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
<method>GETNEW</method>
- <ruri>$notificationpath3:/</ruri>
+ <ruri>$pnotificationpath3:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -88,12 +88,12 @@
</test>
<test name='3'>
<description>Sharee 2 replies ACCEPTED</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
<method>POST</method>
- <ruri>$calendarhome3:/</ruri>
+ <ruri>$pcalendarhome3:/</ruri>
<data substitutions='yes'>
<content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/POST/sharingreply23.xml</filepath>
+ <filepath>Resource/Common/POST/sharingreply23-pod.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -106,13 +106,13 @@
</test>
<test name='4'>
<description>Check Sharee 3 notification collection</description>
- <request user="$userid4:" pswd="$pswd4:" print-response='no'>
+ <request host2="yes" user="$puserid4:" pswd="$ppswd4:" print-response='no'>
<method>WAITCOUNT 1</method>
- <ruri>$notificationpath4:/</ruri>
+ <ruri>$pnotificationpath4:/</ruri>
</request>
- <request user="$userid4:" pswd="$pswd4:" print-response='no'>
+ <request host2="yes" user="$puserid4:" pswd="$ppswd4:" print-response='no'>
<method>GETNEW</method>
- <ruri>$notificationpath4:/</ruri>
+ <ruri>$pnotificationpath4:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -128,12 +128,12 @@
</test>
<test name='5'>
<description>Sharee 3 replies ACCEPTED</description>
- <request user="$userid4:" pswd="$pswd4:" print-response='no'>
+ <request host2="yes" user="$puserid4:" pswd="$ppswd4:" print-response='no'>
<method>POST</method>
- <ruri>$calendarhome4:/</ruri>
+ <ruri>$pcalendarhome4:/</ruri>
<data substitutions='yes'>
<content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/POST/sharingreply24.xml</filepath>
+ <filepath>Resource/Common/POST/sharingreply24-pod.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -150,13 +150,13 @@
<method>DELETEALL</method>
<ruri>$notificationpath2:/</ruri>
</request>
- <request user="$userid3:" pswd="$pswd3:">
+ <request host2="yes" user="$puserid3:" pswd="$ppswd3:">
<method>DELETEALL</method>
- <ruri>$notificationpath3:/</ruri>
+ <ruri>$pnotificationpath3:/</ruri>
</request>
- <request user="$userid4:" pswd="$pswd4:">
+ <request host2="yes" user="$puserid4:" pswd="$ppswd4:">
<method>DELETEALL</method>
- <ruri>$notificationpath4:/</ruri>
+ <ruri>$pnotificationpath4:/</ruri>
</request>
</test>
</test-suite>
@@ -214,7 +214,7 @@
</test>
<test name='4' ignore='no'>
<description>Attachment exists for User 3</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
<method>PROPFIND</method>
<ruri>$dropboxpath2:/54E181BC7CCC373042B28842/</ruri>
<header>
@@ -236,7 +236,7 @@
</test>
<test name='5'>
<description>PUT attachment by user 3</description>
- <request user="$userid3:" pswd="$pswd3:">
+ <request host2="yes" user="$puserid3:" pswd="$ppswd3:">
<method>PUT</method>
<ruri>$dropboxpath2:/54E181BC7CCC373042B28842/3.xml</ruri>
<data>
@@ -250,7 +250,7 @@
</test>
<test name='6' ignore='no'>
<description>Attachments exists for User 4</description>
- <request user="$userid4:" pswd="$pswd4:" print-response='no'>
+ <request host2="yes" user="$puserid4:" pswd="$ppswd4:" print-response='no'>
<method>PROPFIND</method>
<ruri>$dropboxpath2:/54E181BC7CCC373042B28842/</ruri>
<header>
@@ -272,7 +272,7 @@
</test>
<test name='7'>
<description>PUT attachment by user 4</description>
- <request user="$userid4:" pswd="$pswd4:">
+ <request host2="yes" user="$puserid4:" pswd="$ppswd4:">
<method>PUT</method>
<ruri>$dropboxpath2:/54E181BC7CCC373042B28842/3.xml</ruri>
<data>
@@ -313,11 +313,13 @@
<end>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$notificationpath1:/</ruri>
<ruri>$notificationpath2:/</ruri>
- <ruri>$notificationpath3:/</ruri>
- <ruri>$notificationpath4:/</ruri>
</request>
+ <request host2="yes" user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$pnotificationpath3:/</ruri>
+ <ruri>$pnotificationpath4:/</ruri>
+ </request>
</end>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/a8a02897/attachment.html>
More information about the calendarserver-changes
mailing list