[CalendarServer-changes] [14244] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jan 6 08:20:06 PST 2015
Revision: 14244
http://trac.calendarserver.org//changeset/14244
Author: cdaboo at apple.com
Date: 2015-01-06 08:20:06 -0800 (Tue, 06 Jan 2015)
Log Message:
-----------
Test updates for sequence handling to cope with with async iTIP messaging.
Modified Paths:
--------------
CalDAVTester/trunk/README.txt
CalDAVTester/trunk/Resource/CalDAV/availability/17.xml
CalDAVTester/trunk/Resource/CalDAV/availability/19.ics
CalDAVTester/trunk/Resource/CalDAV/availability/4.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-delete-instance/13.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-delete-instance/14.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/13.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/14.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-no-master/13.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-no-master/14.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/3.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/3.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/11.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/7.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/11.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/12.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/7.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/8.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/3.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/8.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/6.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/7.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/8.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/7.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/8.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/9.ics
CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml
CalDAVTester/trunk/scripts/tests/CalDAV/pretest.xml
CalDAVTester/trunk/verifiers/calendarDataMatch.py
Modified: CalDAVTester/trunk/README.txt
===================================================================
--- CalDAVTester/trunk/README.txt 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/README.txt 2015-01-06 16:20:06 UTC (rev 14244)
@@ -343,6 +343,21 @@
the relative path for the file containing the request body
data.
+ ELEMENT <generator>
+ a callback and set of arguments used to generate the data.
+
+ ELEMENT <callback>
+ the name of the generator method to execute.
+
+ ELEMENT <arg>
+ arguments sent to the generator method.
+
+ ELEMENT <name>
+ the name of the argument.
+
+ ELEMENT <value>
+ values for the argument.
+
ELEMENT <substitute>
a set of substitution variables to use on this data only.
Modified: CalDAVTester/trunk/Resource/CalDAV/availability/17.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/17.xml 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/17.xml 2015-01-06 16:20:06 UTC (rev 14244)
@@ -33,8 +33,8 @@
UID:20061005T133225Z-00001-A-availability at example.com
DTSTAMP:20061005T133225Z
SUMMARY:Monday to Friday from 9:00 to 17:00
-DTSTART;TZID=America/Montreal:$now.year.0:0103T090000
-DTEND;TZID=America/Montreal:$now.year.0:0103T170000
+DTSTART;TZID=America/Montreal:$now.year.0:0105T090000
+DTEND;TZID=America/Montreal:$now.year.0:0105T170000
RRULE:FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR
END:AVAILABLE
END:VAVAILABILITY
Modified: CalDAVTester/trunk/Resource/CalDAV/availability/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/19.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/19.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -7,8 +7,8 @@
UID:20060110T231240Z-4011c71-187-6f73-fb
ORGANIZER;CN=$username1::$cuaddr1:
ATTENDEE;CN=$username1::$cuaddr1:
-DTSTART:$now.year.1:0102T000000Z
+DTSTART:$now.year.1:0104T000000Z
DTSTAMP:20060309T185105Z
-DTEND:$now.year.1:0103T000000Z
+DTEND:$now.year.1:0105T000000Z
END:VFREEBUSY
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/CalDAV/availability/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/availability/4.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/availability/4.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -23,7 +23,7 @@
BEGIN:VEVENT
DTSTAMP:20051222T205953Z
CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T120000
DURATION:PT1H
SUMMARY:event 1
UID:$uid1:
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-delete-instance/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-delete-instance/13.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-delete-instance/13.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -31,7 +31,7 @@
ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
RRULE:FREQ=DAILY
-SEQUENCE:2
+SEQUENCE:1
END:VEVENT
BEGIN:VEVENT
DTSTAMP:20051222T205953Z
@@ -60,6 +60,6 @@
ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-SEQUENCE:2
+SEQUENCE:1
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-delete-instance/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-delete-instance/14.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-delete-instance/14.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -47,6 +47,6 @@
ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-SEQUENCE:2
+SEQUENCE:1
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/13.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/13.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -32,7 +32,7 @@
ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
RRULE:FREQ=DAILY
-SEQUENCE:2
+SEQUENCE:1
END:VEVENT
BEGIN:VEVENT
DTSTAMP:20051222T205953Z
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/14.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/14.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -32,7 +32,7 @@
ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
RRULE:FREQ=DAILY
-SEQUENCE:2
+SEQUENCE:1
END:VEVENT
BEGIN:VEVENT
DTSTAMP:20051222T205953Z
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-no-master/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-no-master/13.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-no-master/13.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -31,7 +31,7 @@
ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
RRULE:FREQ=DAILY
-SEQUENCE:2
+SEQUENCE:1
END:VEVENT
BEGIN:VEVENT
DTSTAMP:20051222T205953Z
@@ -60,6 +60,6 @@
ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-SEQUENCE:2
+SEQUENCE:1
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-no-master/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-no-master/14.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-no-master/14.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -47,6 +47,6 @@
ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-SEQUENCE:2
+SEQUENCE:1
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/3.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/3.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -12,7 +12,6 @@
DTSTAMP:20060309T185105Z
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
RRULE:FREQ=DAILY;COUNT=5
-SEQUENCE:1
SUMMARY:Recurring event
TRANSP:OPAQUE
END:VEVENT
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/3.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/3.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -13,7 +13,6 @@
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
RRULE:FREQ=DAILY;COUNT=5
EXDATE:$now.4:T200000Z
-SEQUENCE:2
SUMMARY:Recurring event
TRANSP:OPAQUE
END:VEVENT
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/11.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/11.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -30,7 +30,7 @@
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
RRULE:FREQ=DAILY;COUNT=100
-SEQUENCE:2
+SEQUENCE:1
SUMMARY:event 1
END:VEVENT
BEGIN:VEVENT
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/7.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/7.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -30,7 +30,6 @@
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-SEQUENCE:1
SUMMARY:event 1
TRANSP:TRANSPARENT
END:VEVENT
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/11.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/11.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -24,19 +24,6 @@
BEGIN:VEVENT
DTSTAMP:20051222T205953Z
CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DURATION:PT1H
-SEQUENCE:2
-SUMMARY:event 1
-UID:$uid1:
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=DAILY;COUNT=3
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20051222T205953Z
-CREATED:20060101T150000Z
DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
DURATION:PT1H
SEQUENCE:2
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/12.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/12.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -25,7 +25,6 @@
CREATED:20060101T150000Z
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
-SEQUENCE:2
SUMMARY:event 1
UID:$uid1:
ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/7.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/7.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -24,19 +24,6 @@
BEGIN:VEVENT
DTSTAMP:20051222T205953Z
CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
-DURATION:PT1H
-SEQUENCE:1
-SUMMARY:event 1
-UID:$uid1:
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
-RRULE:FREQ=DAILY;COUNT=3
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20051222T205953Z
-CREATED:20060101T150000Z
DTSTART;TZID=US/Eastern:$now.year.1:0102T110000
DURATION:PT1H
SEQUENCE:1
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/8.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/8.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -25,7 +25,6 @@
CREATED:20060101T150000Z
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
-SEQUENCE:1
SUMMARY:event 1
UID:$uid1:
ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/3.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/3.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -30,7 +30,6 @@
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
RRULE:FREQ=DAILY;COUNT=5
-SEQUENCE:1
SUMMARY:event 1
END:VEVENT
BEGIN:VEVENT
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/8.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/8.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -29,7 +29,6 @@
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
-SEQUENCE:1
SUMMARY:event 1
RRULE:FREQ=DAILY;COUNT=5
END:VEVENT
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/6.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/6.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -25,7 +25,7 @@
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1::$cuaddr1:
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/7.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/7.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -25,7 +25,7 @@
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/8.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/8.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -25,7 +25,7 @@
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/7.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/7.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -25,7 +25,7 @@
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1::$cuaddr1:
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/8.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/8.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -25,7 +25,7 @@
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/9.ics 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/9.ics 2015-01-06 16:20:06 UTC (rev 14244)
@@ -25,7 +25,7 @@
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml 2015-01-06 16:20:06 UTC (rev 14244)
@@ -494,9 +494,9 @@
<callback>dataString</callback>
<arg>
<name>contains</name>
- <value>FREEBUSY;FBTYPE=BUSY:$now.year.1:0102T170000Z/PT1H</value>
- <value>FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:$now.year.1:0102T000000Z/$now.year.1:0102T140000Z,$now.year.1:010
- 2T220000Z/$now.year.1:0103T000000Z</value>
+ <value>FREEBUSY;FBTYPE=BUSY:$now.year.1:0104T170000Z/PT1H</value>
+ <value>FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:$now.year.1:0104T000000Z/$now.year.1:0104T140000Z,$now.year.1:010
+ 4T220000Z/$now.year.1:0105T000000Z</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml 2015-01-06 16:20:06 UTC (rev 14244)
@@ -278,7 +278,6 @@
<arg>
<name>exists</name>
<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}master</value>
- <value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property[@name="ATTENDEE"]</value>
<value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property[@name="SUMMARY"]</value>
</arg>
</verify>
@@ -2054,7 +2053,7 @@
<ruri>$inboxpath2:/</ruri>
</request>
</test>
- <test name='16'>
+ <test name='11'>
<description>Attendee has data - X- preserved</description>
<request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/pretest.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/pretest.xml 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/pretest.xml 2015-01-06 16:20:06 UTC (rev 14244)
@@ -48,7 +48,7 @@
</verify>
</request>
</test>
- <test name='1'>
+ <test name='2'>
<description>PROPFIND of basic properties depth=0</description>
<request>
<method>PROPFIND</method>
Modified: CalDAVTester/trunk/verifiers/calendarDataMatch.py
===================================================================
--- CalDAVTester/trunk/verifiers/calendarDataMatch.py 2015-01-05 19:04:56 UTC (rev 14243)
+++ CalDAVTester/trunk/verifiers/calendarDataMatch.py 2015-01-06 16:20:06 UTC (rev 14244)
@@ -16,6 +16,7 @@
from difflib import unified_diff
from pycalendar.icalendar.calendar import Calendar
+from pycalendar.icalendar.componentrecur import ComponentRecur
from pycalendar.parameter import Parameter
import os
@@ -40,6 +41,7 @@
filters.append("ORGANIZER:EMAIL")
filters.append("ATTENDEE:X-CALENDARSERVER-DTSTAMP")
filters.append("ATTENDEE:X-CALENDARSERVER-AUTO")
+ filters.append("ATTENDEE:X-CALENDARSERVER-RESET-PARTSTAT")
filters.append("CALSCALE")
filters.append("PRODID")
filters.append("DTSTAMP")
@@ -116,15 +118,55 @@
if property.getName() == filter:
component.removeProperty(property)
+ def reconcileRecurrenceOverrides(calendar1, calendar2):
+ """
+ Make sure that the same set of overridden components appears in both calendar objects.
+ """
+ def _getRids(calendar):
+ """
+ Get all the recurrence ids of the specified calendar.
+ """
+ results = set()
+ master = None
+ for subcomponent in calendar.getComponents():
+ if isinstance(subcomponent, ComponentRecur):
+ rid = subcomponent.getRecurrenceID()
+ if rid:
+ results.add(rid.duplicateAsUTC())
+ else:
+ master = subcomponent
+ return results, master
+
+ def _addOverrides(calendar, master, missing_rids):
+ """
+ Derive instances for the missing overrides in the specified calendar object.
+ """
+ if master is None or not missing_rids:
+ return
+ for rid in missing_rids:
+ # If we were fed an already derived component, use that, otherwise make a new one
+ newcomp = calendar.deriveComponent(rid)
+ if newcomp is not None:
+ calendar.addComponent(newcomp)
+
+ rids1, master1 = _getRids(calendar1)
+ rids2, master2 = _getRids(calendar2)
+
+ _addOverrides(calendar1, master1, rids2 - rids1)
+ _addOverrides(calendar2, master2, rids1 - rids2)
+
try:
format = Calendar.sFormatJSON if is_json else Calendar.sFormatText
resp_calendar = Calendar.parseData(respdata, format=format)
removePropertiesParameters(resp_calendar)
- respdata = resp_calendar.getText(includeTimezones=Calendar.NO_TIMEZONES, format=format)
data_calendar = Calendar.parseData(data, format=format)
removePropertiesParameters(data_calendar)
+
+ reconcileRecurrenceOverrides(resp_calendar, data_calendar)
+
+ respdata = resp_calendar.getText(includeTimezones=Calendar.NO_TIMEZONES, format=format)
data = data_calendar.getText(includeTimezones=Calendar.NO_TIMEZONES, format=format)
result = resp_calendar == data_calendar
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150106/5729008e/attachment-0001.html>
More information about the calendarserver-changes
mailing list