diff --git a/testing/tests/scheduling/3030-DELETE-attendee-event.result b/testing/tests/scheduling/3030-DELETE-attendee-event.result index 0e514a6b..66efe9ce 100644 --- a/testing/tests/scheduling/3030-DELETE-attendee-event.result +++ b/testing/tests/scheduling/3030-DELETE-attendee-event.result @@ -6,7 +6,8 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - caldav_data: >BEGIN:VCALENDAR + dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< + vcalendar: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//iCal 4.0.4//EN CALSCALE:GREGORIAN @@ -34,7 +35,7 @@ DTEND;TZID=Pacific/Auckland:20111019T140000 TRANSP:OPAQUE SUMMARY:Meeting with User1 DTSTART;TZID=Pacific/Auckland:20111019T130000 -DTSTAMP:20111024T035702Z +DTSTAMP:looks good ORGANIZER;CN="Manager 1":mailto:manager1@example.net SEQUENCE:6 ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED: @@ -45,9 +46,9 @@ ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net; END:VEVENT END:VCALENDAR < - dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< - caldav_data: >BEGIN:VCALENDAR + dav_name: >/manager1/.in/user1E1A13F04-iCal-schedule.ics< + vcalendar: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//iCal 4.0.4//EN CALSCALE:GREGORIAN @@ -62,9 +63,8 @@ ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net; DTSTART:20111019T000000Z ORGANIZER;CN="Manager 1":mailto:manager1@example.net SEQUENCE:7 -DTSTAMP:20111102T010804Z +DTSTAMP:looks good END:VEVENT END:VCALENDAR < - dav_name: >/manager1/.in/user1E1A13F04-iCal-schedule.ics< diff --git a/testing/tests/scheduling/3030-DELETE-attendee-event.test b/testing/tests/scheduling/3030-DELETE-attendee-event.test index 3f7ec167..4ad22f4c 100644 --- a/testing/tests/scheduling/3030-DELETE-attendee-event.test +++ b/testing/tests/scheduling/3030-DELETE-attendee-event.test @@ -15,7 +15,7 @@ HEAD # - An iTIP message in the managers's inbox. QUERY SELECT calendar_item.dav_name, - caldav_data.caldav_data + regexp_replace(caldav_data,'DTSTAMP:[0-9T]{15}Z','DTSTAMP:looks good') AS vcalendar FROM calendar_item JOIN caldav_data USING(dav_id, dav_name) WHERE uid = 'E1A13F04-iCal-schedule' ORDER BY dav_id diff --git a/testing/tests/scheduling/3031-DELETE-reply.result b/testing/tests/scheduling/3031-DELETE-reply.result new file mode 100644 index 00000000..5777a85a --- /dev/null +++ b/testing/tests/scheduling/3031-DELETE-reply.result @@ -0,0 +1,10 @@ +HTTP/1.1 204 No Content +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + + + dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< + diff --git a/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result new file mode 100644 index 00000000..67673f9e --- /dev/null +++ b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result @@ -0,0 +1,370 @@ +HTTP/1.1 100 Continue + +HTTP/1.1 204 No Content +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + + + caldav_type: >VEVENT< + dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< + logged_user: >20< + summary: >Meeting with User1< + user_no: >20< + vcalendar: >BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//iCal 4.0.4//EN +CALSCALE:GREGORIAN +BEGIN:VTIMEZONE +TZID:Pacific/Auckland +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU +DTSTART:20070930T020000 +TZNAME:GMT+13:00 +TZOFFSETTO:+1300 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20080406T030000 +TZNAME:GMT+12:00 +TZOFFSETTO:+1200 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +CREATED:20111018T195845Z +UID:E1A13F04-iCal-schedule +DTEND;TZID=Pacific/Auckland:20111019T140000 +ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED: + mailto:manager1@example.net +ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net; + PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2 + :mailto:user1@example.net +ATTENDEE;CN=user2@example.net;CUTYPE=INDIVIDUAL;EMAIL=user2@example.net; + PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2 + :mailto:user2@example.net +ATTENDEE;CN=user3@example.net;CUTYPE=INDIVIDUAL;EMAIL=user3@example.net; + PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2 + :mailto:user3@example.net +TRANSP:OPAQUE +SUMMARY:Meeting with User1 +DTSTART;TZID=Pacific/Auckland:20111019T130000 +DTSTAMP:20111024T035702Z +ORGANIZER;CN="Manager 1":mailto:manager1@example.net +SEQUENCE:7 +END:VEVENT +END:VCALENDAR +< + + caldav_type: >VEVENT< + dav_name: >/user1/.in/E1A13F04-iCal-schedule.ics< + logged_user: >20< + summary: >Meeting with User1< + user_no: >10< + vcalendar: >BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//iCal 4.0.4//EN +CALSCALE:GREGORIAN +METHOD:REQUEST +BEGIN:VTIMEZONE +TZID:Pacific/Auckland +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU +DTSTART:20070930T020000 +TZNAME:GMT+13:00 +TZOFFSETTO:+1300 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20080406T030000 +TZNAME:GMT+12:00 +TZOFFSETTO:+1200 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +CREATED:20111018T195845Z +UID:E1A13F04-iCal-schedule +DTEND;TZID=Pacific/Auckland:20111019T140000 +ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag + er1@example.net +ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex + ample.net +ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex + ample.net +ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex + ample.net +TRANSP:OPAQUE +SUMMARY:Meeting with User1 +DTSTART;TZID=Pacific/Auckland:20111019T130000 +DTSTAMP:20111024T035702Z +ORGANIZER;CN="Manager 1":mailto:manager1@example.net +SEQUENCE:7 +END:VEVENT +END:VCALENDAR +< + + caldav_type: >VEVENT< + dav_name: >/user1/home/E1A13F04-iCal-schedule.ics< + logged_user: >20< + summary: >Meeting with User1< + user_no: >10< + vcalendar: >BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//iCal 4.0.4//EN +CALSCALE:GREGORIAN +BEGIN:VTIMEZONE +TZID:Pacific/Auckland +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU +DTSTART:20070930T020000 +TZNAME:GMT+13:00 +TZOFFSETTO:+1300 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20080406T030000 +TZNAME:GMT+12:00 +TZOFFSETTO:+1200 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +CREATED:20111018T195845Z +UID:E1A13F04-iCal-schedule +DTEND;TZID=Pacific/Auckland:20111019T140000 +ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag + er1@example.net +ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex + ample.net +ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex + ample.net +ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex + ample.net +TRANSP:OPAQUE +SUMMARY:Meeting with User1 +DTSTART;TZID=Pacific/Auckland:20111019T130000 +DTSTAMP:20111024T035702Z +ORGANIZER;CN="Manager 1":mailto:manager1@example.net +SEQUENCE:7 +END:VEVENT +END:VCALENDAR +< + + caldav_type: >VEVENT< + dav_name: >/user2/.in/E1A13F04-iCal-schedule.ics< + logged_user: >20< + summary: >Meeting with User1< + user_no: >11< + vcalendar: >BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//iCal 4.0.4//EN +CALSCALE:GREGORIAN +METHOD:REQUEST +BEGIN:VTIMEZONE +TZID:Pacific/Auckland +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU +DTSTART:20070930T020000 +TZNAME:GMT+13:00 +TZOFFSETTO:+1300 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20080406T030000 +TZNAME:GMT+12:00 +TZOFFSETTO:+1200 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +CREATED:20111018T195845Z +UID:E1A13F04-iCal-schedule +DTEND;TZID=Pacific/Auckland:20111019T140000 +ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag + er1@example.net +ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex + ample.net +ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex + ample.net +ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex + ample.net +TRANSP:OPAQUE +SUMMARY:Meeting with User1 +DTSTART;TZID=Pacific/Auckland:20111019T130000 +DTSTAMP:20111024T035702Z +ORGANIZER;CN="Manager 1":mailto:manager1@example.net +SEQUENCE:7 +END:VEVENT +END:VCALENDAR +< + + caldav_type: >VEVENT< + dav_name: >/user2/home/E1A13F04-iCal-schedule.ics< + logged_user: >20< + summary: >Meeting with User1< + user_no: >11< + vcalendar: >BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//iCal 4.0.4//EN +CALSCALE:GREGORIAN +BEGIN:VTIMEZONE +TZID:Pacific/Auckland +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU +DTSTART:20070930T020000 +TZNAME:GMT+13:00 +TZOFFSETTO:+1300 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20080406T030000 +TZNAME:GMT+12:00 +TZOFFSETTO:+1200 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +CREATED:20111018T195845Z +UID:E1A13F04-iCal-schedule +DTEND;TZID=Pacific/Auckland:20111019T140000 +ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag + er1@example.net +ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex + ample.net +ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex + ample.net +ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex + ample.net +TRANSP:OPAQUE +SUMMARY:Meeting with User1 +DTSTART;TZID=Pacific/Auckland:20111019T130000 +DTSTAMP:20111024T035702Z +ORGANIZER;CN="Manager 1":mailto:manager1@example.net +SEQUENCE:7 +END:VEVENT +END:VCALENDAR +< + + caldav_type: >VEVENT< + dav_name: >/user3/.in/E1A13F04-iCal-schedule.ics< + logged_user: >20< + summary: >Meeting with User1< + user_no: >12< + vcalendar: >BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//iCal 4.0.4//EN +CALSCALE:GREGORIAN +METHOD:REQUEST +BEGIN:VTIMEZONE +TZID:Pacific/Auckland +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU +DTSTART:20070930T020000 +TZNAME:GMT+13:00 +TZOFFSETTO:+1300 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20080406T030000 +TZNAME:GMT+12:00 +TZOFFSETTO:+1200 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +CREATED:20111018T195845Z +UID:E1A13F04-iCal-schedule +DTEND;TZID=Pacific/Auckland:20111019T140000 +ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag + er1@example.net +ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex + ample.net +ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex + ample.net +ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex + ample.net +TRANSP:OPAQUE +SUMMARY:Meeting with User1 +DTSTART;TZID=Pacific/Auckland:20111019T130000 +DTSTAMP:20111024T035702Z +ORGANIZER;CN="Manager 1":mailto:manager1@example.net +SEQUENCE:7 +END:VEVENT +END:VCALENDAR +< + + caldav_type: >VEVENT< + dav_name: >/user3/home/E1A13F04-iCal-schedule.ics< + logged_user: >20< + summary: >Meeting with User1< + user_no: >12< + vcalendar: >BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//iCal 4.0.4//EN +CALSCALE:GREGORIAN +BEGIN:VTIMEZONE +TZID:Pacific/Auckland +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU +DTSTART:20070930T020000 +TZNAME:GMT+13:00 +TZOFFSETTO:+1300 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU +DTSTART:20080406T030000 +TZNAME:GMT+12:00 +TZOFFSETTO:+1200 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +CREATED:20111018T195845Z +UID:E1A13F04-iCal-schedule +DTEND;TZID=Pacific/Auckland:20111019T140000 +ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag + er1@example.net +ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex + ample.net +ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex + ample.net +ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n + et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex + ample.net +TRANSP:OPAQUE +SUMMARY:Meeting with User1 +DTSTART;TZID=Pacific/Auckland:20111019T130000 +DTSTAMP:20111024T035702Z +ORGANIZER;CN="Manager 1":mailto:manager1@example.net +SEQUENCE:7 +END:VEVENT +END:VCALENDAR +< + diff --git a/testing/tests/scheduling/3032-PUT-iCal-with-attendees.test b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.test index 6d24381b..7a2ef1a4 100644 --- a/testing/tests/scheduling/3032-PUT-iCal-with-attendees.test +++ b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.test @@ -8,7 +8,6 @@ TYPE=PUT URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics HEADER=Content-Type: text/calendar HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) -HEADER=If-Match: "651df94a71cc99384231637a5df101f4" HEAD AUTH=manager1:manager1 diff --git a/testing/tests/scheduling/3033-DELETE-organizer-event.result b/testing/tests/scheduling/3033-DELETE-organizer-event.result new file mode 100644 index 00000000..3219a3f7 --- /dev/null +++ b/testing/tests/scheduling/3033-DELETE-organizer-event.result @@ -0,0 +1,95 @@ +SQL executed successfully. +DELETE FROM caldav_data WHERE dav_name ~ E'/\\.in/.*E1A13F04-iCal-schedule\\.ics' + +HTTP/1.1 204 No Content +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + + + caldav_data: >BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//iCal 4.0.4//EN +CALSCALE:GREGORIAN +METHOD:CANCEL +REQUEST-STATUS:2.0 +BEGIN:VEVENT +UID:E1A13F04-iCal-schedule +DTEND:20111019T010000Z +ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED: + mailto:manager1@example.net +ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net; + PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2 + :mailto:user1@example.net +ATTENDEE;CN=user2@example.net;CUTYPE=INDIVIDUAL;EMAIL=user2@example.net; + PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2 + :mailto:user2@example.net +ATTENDEE;CN=user3@example.net;CUTYPE=INDIVIDUAL;EMAIL=user3@example.net; + PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2 + :mailto:user3@example.net +DTSTART:20111019T000000Z +ORGANIZER;CN="Manager 1":mailto:manager1@example.net +SEQUENCE:7 +END:VEVENT +END:VCALENDAR +< + dav_name: >/user1/.in/E1A13F04-iCal-schedule.ics< + + caldav_data: >BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//iCal 4.0.4//EN +CALSCALE:GREGORIAN +METHOD:CANCEL +REQUEST-STATUS:2.0 +BEGIN:VEVENT +UID:E1A13F04-iCal-schedule +DTEND:20111019T010000Z +ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED: + mailto:manager1@example.net +ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net; + PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2 + :mailto:user1@example.net +ATTENDEE;CN=user2@example.net;CUTYPE=INDIVIDUAL;EMAIL=user2@example.net; + PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2 + :mailto:user2@example.net +ATTENDEE;CN=user3@example.net;CUTYPE=INDIVIDUAL;EMAIL=user3@example.net; + PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2 + :mailto:user3@example.net +DTSTART:20111019T000000Z +ORGANIZER;CN="Manager 1":mailto:manager1@example.net +SEQUENCE:7 +END:VEVENT +END:VCALENDAR +< + dav_name: >/user2/.in/E1A13F04-iCal-schedule.ics< + + caldav_data: >BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//iCal 4.0.4//EN +CALSCALE:GREGORIAN +METHOD:CANCEL +REQUEST-STATUS:2.0 +BEGIN:VEVENT +UID:E1A13F04-iCal-schedule +DTEND:20111019T010000Z +ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED: + mailto:manager1@example.net +ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net; + PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2 + :mailto:user1@example.net +ATTENDEE;CN=user2@example.net;CUTYPE=INDIVIDUAL;EMAIL=user2@example.net; + PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2 + :mailto:user2@example.net +ATTENDEE;CN=user3@example.net;CUTYPE=INDIVIDUAL;EMAIL=user3@example.net; + PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2 + :mailto:user3@example.net +DTSTART:20111019T000000Z +ORGANIZER;CN="Manager 1":mailto:manager1@example.net +SEQUENCE:7 +END:VEVENT +END:VCALENDAR +< + dav_name: >/user3/.in/E1A13F04-iCal-schedule.ics< + diff --git a/testing/tests/timezone/Restore-Database.result b/testing/tests/timezone/Restore-Database.result index ba0eace9..1ae8b555 100644 --- a/testing/tests/timezone/Restore-Database.result +++ b/testing/tests/timezone/Restore-Database.result @@ -1,6 +1,6 @@ setval -------- - 1657 + 1667 (1 row) setval