[CalendarServer-changes] [14825] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue May 26 09:50:29 PDT 2015


Revision: 14825
          http://trac.calendarserver.org//changeset/14825
Author:   sagen at apple.com
Date:     2015-05-26 09:50:28 -0700 (Tue, 26 May 2015)
Log Message:
-----------
Fix trash test

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/recovered.ics
    CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml

Modified: CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/recovered.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/recovered.ics	2015-05-25 22:46:35 UTC (rev 14824)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/recovered.ics	2015-05-26 16:50:28 UTC (rev 14825)
@@ -6,11 +6,11 @@
 DTSTART:$now.8:T200000Z
 DURATION:PT1H
 ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
-ATTENDEE;CN=$username2:;EMAIL=$email2:;PARTSTAT=TENTATIVE:$cuaddrurn2:
+ATTENDEE;CN=$username2:;EMAIL=$email2:;PARTSTAT=TENTATIVE;SCHEDULE-STATUS=2.0:$cuaddrurn2:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml	2015-05-25 22:46:35 UTC (rev 14824)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml	2015-05-26 16:50:28 UTC (rev 14825)
@@ -498,11 +498,11 @@
                 <ruri>$inboxpath1:/</ruri>
             </request>
         </test>
-        <test name='12'>
+        <test name='11'>
             <description>Organizer sees tentative</description>
-            <request user="$userid2:" pswd="$pswd2:">
-                <method>GETNEW</method>
-                <ruri>$calendarpath2:/</ruri>
+            <request user="$useradmin:" pswd="$pswdadmin:">
+                <method>GET</method>
+                <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
                 <verify>
                     <callback>calendarDataMatch</callback>
                     <arg>
@@ -512,7 +512,7 @@
                 </verify>
             </request>
         </test>
-        <test name='13'>
+        <test name='12'>
             <description>Clean up</description>
             <request>
                 <method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150526/a25d201f/attachment.html>


More information about the calendarserver-changes mailing list