diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2017-12-14 05:07:33 -0800 |
---|---|---|
committer | Patrick Ohly <patrick.ohly@intel.com> | 2018-01-03 10:39:50 +0100 |
commit | 60de1423aaa9b6f931acb278f70d7dde332575b4 (patch) | |
tree | 3fad8b659b6f8c9bbdb6df6ee4f1d7e8209511ff | |
parent | 0abc7d825139bf8dcba56eb32404b548c3082d9d (diff) |
testing: work around Google CalDAV RECURRENCE-ID
Stand-alone events with RECURRENCE-ID get mangled by the server:
it converts the RECURRENCE-ID time to UTC. Reported in:
https://stackoverflow.com/questions/47811670/detached-recurrence-without-parent-event
For now we ignore the error (googlecalendar source) or avoid it (testItems).
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
-rwxr-xr-x | test/runtests.py | 10 | ||||
-rw-r--r-- | test/testcases/eds_event.ics.googlecalendar.tem.patch | 52 |
2 files changed, 18 insertions, 44 deletions
diff --git a/test/runtests.py b/test/runtests.py index 8fed3571..30be2c81 100755 --- a/test/runtests.py +++ b/test/runtests.py @@ -1694,6 +1694,16 @@ test = SyncEvolutionTest("googlecalendar", compile, "Client::Source::google_caldav::LinkedItemsAllDayGoogle::testLinkedItemsInsertChildTwice," "Client::Source::google_caldav::LinkedItemsAllDayGoogle::testLinkedItemsUpdateChild," "Client::Source::google_caldav::LinkedItemsAllDayGoogle::testLinkedItemsUpdateChildNoIDs," + # A child without parent has its RECURRENCE-ID turned into UTC. + # https://stackoverflow.com/questions/47811670/detached-recurrence-without-parent-event + "Client::Source::google_caldav::LinkedItemsDefault::testLinkedItemsChild," + "Client::Source::google_caldav::LinkedItemsDefault::testLinkedItemsInsertChildTwice," + "Client::Source::google_caldav::LinkedItemsDefault::testLinkedItemsUpdateChild," + "Client::Source::google_caldav::LinkedItemsDefault::testLinkedItemsUpdateChildNoIDs," + "Client::Source::google_caldav::LinkedItemsWithVALARM::testLinkedItemsChild," + "Client::Source::google_caldav::LinkedItemsWithVALARM::testLinkedItemsInsertChildTwice," + "Client::Source::google_caldav::LinkedItemsWithVALARM::testLinkedItemsUpdateChild," + "Client::Source::google_caldav::LinkedItemsWithVALARM::testLinkedItemsUpdateChildNoIDs," , testPrefix=options.testprefix) context.add(test) diff --git a/test/testcases/eds_event.ics.googlecalendar.tem.patch b/test/testcases/eds_event.ics.googlecalendar.tem.patch index 3f5c47e0..f378dac5 100644 --- a/test/testcases/eds_event.ics.googlecalendar.tem.patch +++ b/test/testcases/eds_event.ics.googlecalendar.tem.patch @@ -255,7 +255,7 @@ -PRODID:-//Ximian//NONSGML Evolution Calendar//EN
-VERSION:2.0
+BEGIN:VTIMEZONE
-+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
++TZID:Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
@@ -277,8 +277,8 @@ DTSTAMP:20080407T193125Z
-DTSTART:20080406T090000Z
-DTEND:20080406T093000Z
-+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:20080406T110000
-+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:20080406T113000
++DTSTART;TZID=Europe/Berlin:20080406T110000
++DTEND;TZID=Europe/Berlin:20080406T113000
TRANSP:OPAQUE
SEQUENCE:2
SUMMARY:Recurring
@@ -287,7 +287,7 @@ PRODID:-//Ximian//NONSGML Evolution Calendar//EN
VERSION:2.0
+BEGIN:VTIMEZONE
-+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
++TZID:Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
@@ -309,8 +309,8 @@ DTSTAMP:20080407T193125Z
-DTSTART:20080413T090000Z
-DTEND:20080413T093000Z
-+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:20080413T110000
-+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:20080413T113000
++DTSTART;TZID=Europe/Berlin:20080413T110000
++DTEND;TZID=Europe/Berlin:20080413T113000
TRANSP:OPAQUE
SEQUENCE:7
SUMMARY:Recurring: Modified
@@ -318,7 +318,7 @@ CREATED:20080407T193241Z
LAST-MODIFIED:20080407T193647
-RECURRENCE-ID:20080413T090000Z
-+RECURRENCE-ID;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:20080413T110000
++RECURRENCE-ID;TZID=Europe/Berlin:20080413T110000
DESCRIPTION:second instance modified
END:VEVENT
END:VCALENDAR
@@ -435,43 +435,7 @@ DESCRIPTION:second instance modified\, single detached recurrence
END:VEVENT
END:VCALENDAR
-@@ -345,71 +520,36 @@ - BEGIN:VCALENDAR
- PRODID:-//Ximian//NONSGML Evolution Calendar//EN
- VERSION:2.0
-+BEGIN:VTIMEZONE
-+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
-+X-LIC-LOCATION:Europe/Berlin
-+BEGIN:DAYLIGHT
-+TZOFFSETFROM:+0100
-+TZOFFSETTO:+0200
-+TZNAME:CEST
-+DTSTART:19700329T020000
-+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
-+END:DAYLIGHT
-+BEGIN:STANDARD
-+TZOFFSETFROM:+0200
-+TZOFFSETTO:+0100
-+TZNAME:CET
-+DTSTART:19701025T030000
-+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
-+END:STANDARD
-+END:VTIMEZONE
- BEGIN:VEVENT
- UID:20080407T193125Z-19554-727-1-50-YY@gollum
- DTSTAMP:20080407T193125Z
--DTSTART:20080413T090000Z
--DTEND:20080413T093000Z
-+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:20080413T110000
-+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:20080413T113000
- TRANSP:OPAQUE
- SEQUENCE:7
- SUMMARY:Recurring 3: Modified
- CLASS:PUBLIC
- CREATED:20080407T193241Z
- LAST-MODIFIED:20080407T193647
--RECURRENCE-ID:20080413T090000Z
-+RECURRENCE-ID;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:20080413T110000
+@@ -360,56 +535,3 @@ DESCRIPTION:second instance modified
END:VEVENT
END:VCALENDAR
|