<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13137] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13137">13137</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-02 17:47:13 -0700 (Wed, 02 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure converting from one timezone to another works correctly near a DST change.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavicalpy">CalendarServer/trunk/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_icaldiffpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_icaldiff.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_implicitpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/ical.py (13136 => 13137)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/ical.py 2014-04-03 00:46:02 UTC (rev 13136)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2014-04-03 00:47:13 UTC (rev 13137)
</span><span class="lines">@@ -3489,10 +3489,10 @@
</span><span class="cx"> start.setDateOnly(False)
</span><span class="cx"> if tzexpanded:
</span><span class="cx"> if start != tzexpanded[0][0]:
</span><del>- results.append((str(start), UTCOffsetValue(tzexpanded[0][1]).getText(),))
</del><ins>+ results.append((str(start), UTCOffsetValue(tzexpanded[0][2]).getText(),))
</ins><span class="cx"> else:
</span><span class="cx"> results.append((str(start), UTCOffsetValue(tzcomp._pycalendar.getTimezoneOffsetSeconds(start)).getText(),))
</span><del>- for tzstart, _ignore_tzoffsetfrom, tzoffsetto in tzexpanded:
</del><ins>+ for tzstart, _ignore_utctzstart, _ignore_tzoffsetfrom, tzoffsetto in tzexpanded:
</ins><span class="cx"> results.append((
</span><span class="cx"> tzstart.getText(),
</span><span class="cx"> UTCOffsetValue(tzoffsetto).getText(),
</span><span class="lines">@@ -3536,9 +3536,9 @@
</span><span class="cx"> if start != tzexpanded[0][0]:
</span><span class="cx"> results.append((
</span><span class="cx"> start,
</span><del>- tzexpanded[0][1],
- tzexpanded[0][1],
- tzexpanded[0][3],
</del><ins>+ tzexpanded[0][2],
+ tzexpanded[0][2],
+ tzexpanded[0][4],
</ins><span class="cx"> ))
</span><span class="cx"> else:
</span><span class="cx"> results.append((
</span><span class="lines">@@ -3547,7 +3547,7 @@
</span><span class="cx"> tzcomp._pycalendar.getTimezoneOffsetSeconds(start),
</span><span class="cx"> tzcomp._pycalendar.getTimezoneDescriptor(start),
</span><span class="cx"> ))
</span><del>- for tzstart, tzoffsetfrom, tzoffsetto, name in tzexpanded:
</del><ins>+ for tzstart, _ignore_utctzstart, tzoffsetfrom, tzoffsetto, name in tzexpanded:
</ins><span class="cx"> results.append((
</span><span class="cx"> tzstart,
</span><span class="cx"> tzoffsetfrom,
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_icaldiffpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_icaldiff.py (13136 => 13137)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_icaldiff.py 2014-04-03 00:46:02 UTC (rev 13136)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_icaldiff.py 2014-04-03 00:47:13 UTC (rev 13137)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.stdconfig import config
</span><span class="cx"> from twistedcaldav.ical import Component
</span><ins>+from twistedcaldav.timezones import TimezoneCache
</ins><span class="cx">
</span><span class="cx"> from txdav.caldav.datastore.scheduling.icaldiff import iCalDiff
</span><span class="cx">
</span><span class="lines">@@ -3273,6 +3274,240 @@
</span><span class="cx"> self.assertEqual(diffResult, result, msg="%s: actual result: (%s)" % (description, ", ".join([str(i).replace("\r", "") for i in diffResult]),))
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_attendee_merge_timezonedst(self):
+
+ data = (
+ (
+ "#1.1",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+DTSTART;TZID=America/Los_Angeles:20140302T190000
+DTEND;TZID=America/Los_Angeles:20140302T193000
+ORGANIZER;CN="User 01":mailto:user1@example.com
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+RRULE:FREQ=DAILY;UNTIL=20140309T075959Z
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140303T190000
+DTSTART;TZID=America/Los_Angeles:20140303T190000
+DTEND;TZID=America/Los_Angeles:20140303T193000
+ORGANIZER;CN="User 01":mailto:user1@example.com
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140304T190000
+DTSTART;TZID=America/Los_Angeles:20140305T190000
+DTEND;TZID=America/Los_Angeles:20140305T193000
+ORGANIZER;CN="User 01":mailto:user1@example.com
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140305T190000
+DTSTART;TZID=America/Los_Angeles:20140304T190000
+DTEND;TZID=America/Los_Angeles:20140304T193000
+ORGANIZER;CN="User 01":mailto:user1@example.com
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140307T190000
+DTSTART;TZID=America/Los_Angeles:20140307T190000
+DTEND;TZID=America/Los_Angeles:20140307T193000
+ORGANIZER;CN="User 01":mailto:user1@example.com
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+DTSTART;TZID=America/Los_Angeles:20140302T190000
+DTEND;TZID=America/Los_Angeles:20140302T193000
+ORGANIZER;CN="User 01":mailto:user1@example.com
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+RRULE:FREQ=DAILY;UNTIL=20140309T075959Z
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140303T190000
+DTSTART;TZID=America/Los_Angeles:20140303T190000
+DTEND;TZID=America/Los_Angeles:20140303T193000
+ORGANIZER;CN="User 01":mailto:user1@example.com
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140304T190000
+DTSTART;TZID=America/Los_Angeles:20140305T190000
+DTEND;TZID=America/Los_Angeles:20140305T193000
+ORGANIZER;CN="User 01":mailto:user1@example.com
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140305T190000
+DTSTART;TZID=America/Los_Angeles:20140304T190000
+DTEND;TZID=America/Los_Angeles:20140304T193000
+ORGANIZER;CN="User 01":mailto:user1@example.com
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140307T190000
+DTSTART;TZID=America/Los_Angeles:20140307T190000
+DTEND;TZID=America/Los_Angeles:20140307T193000
+ORGANIZER;CN="User 01":mailto:user1@example.com
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140308T190000
+DTSTART;TZID=America/Los_Angeles:20140308T190000
+DTEND;TZID=America/Los_Angeles:20140308T193000
+ORGANIZER;CN="User 01":mailto:user1@example.com
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;RSVP=TRUE;PARTSTAT=DECLINED:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ "mailto:user2@example.com",
+ (True, True, ('20140309T030000Z',), """BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+DTSTART;TZID=America/Los_Angeles:20140302T190000
+DTEND;TZID=America/Los_Angeles:20140302T193000
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+RRULE:FREQ=DAILY;UNTIL=20140309T075959Z
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140303T190000
+DTSTART;TZID=America/Los_Angeles:20140303T190000
+DTEND;TZID=America/Los_Angeles:20140303T193000
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140304T190000
+DTSTART;TZID=America/Los_Angeles:20140305T190000
+DTEND;TZID=America/Los_Angeles:20140305T193000
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140305T190000
+DTSTART;TZID=America/Los_Angeles:20140304T190000
+DTEND;TZID=America/Los_Angeles:20140304T193000
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140307T190000
+DTSTART;TZID=America/Los_Angeles:20140307T190000
+DTEND;TZID=America/Los_Angeles:20140307T193000
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:252ECE12-3C4F-4895-8AE6-EB45DC9156D2
+RECURRENCE-ID;TZID=America/Los_Angeles:20140308T190000
+DTSTART;TZID=America/Los_Angeles:20140308T190000
+DTEND;TZID=America/Los_Angeles:20140308T193000
+ATTENDEE:mailto:user1@example.com
+ATTENDEE;PARTSTAT=DECLINED;RSVP=TRUE;X-CALENDARSERVER-DTSTAMP=XXXXXXXXTXXXXXXZ:mailto:user2@example.com
+DTSTAMP:20140307T052759Z
+ORGANIZER;CN=User 01:mailto:user1@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""")
+ ),
+ )
+
+ TimezoneCache.create()
+ for description, calendar1, calendar2, attendee, result in data:
+ differ = iCalDiff(Component.fromString(calendar1), Component.fromString(calendar2), False)
+ diffResult = differ.attendeeMerge(attendee)
+ diffResult = (
+ diffResult[0],
+ diffResult[1],
+ tuple(sorted(diffResult[2])),
+ re.sub(
+ "X-CALENDARSERVER-DTSTAMP=[^Z]+",
+ "X-CALENDARSERVER-DTSTAMP=XXXXXXXXTXXXXXX",
+ str(diffResult[3]).replace("\r", "").replace("\n ", "")
+ ) if diffResult[3] else None,
+ )
+ result = list(result)
+ result[2] = tuple([(DateTime.parseText(dt) if dt else None) for dt in result[2]])
+ result = tuple(result)
+ self.assertEqual(diffResult, result, msg="%s: actual result: (%s)" % (description, ", ".join([str(i).replace("\r", "") for i in diffResult]),))
+
+
</ins><span class="cx"> def test_what_is_different(self):
</span><span class="cx">
</span><span class="cx"> data1 = (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_implicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py (13136 => 13137)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py 2014-04-03 00:46:02 UTC (rev 13136)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py 2014-04-03 00:47:13 UTC (rev 13137)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.ical import Component
</span><ins>+from twistedcaldav.timezones import TimezoneCache
</ins><span class="cx">
</span><span class="cx"> from txdav.caldav.datastore.scheduling.implicit import ImplicitScheduler, \
</span><span class="cx"> ScheduleReplyWork
</span><span class="lines">@@ -1575,3 +1576,67 @@
</span><span class="cx"> self.assertTrue("PARTSTAT=ACCEPTED" in calendar3)
</span><span class="cx">
</span><span class="cx"> yield deferLater(reactor, 2.0, _test_user03_refresh)
</span><ins>+
+
+ @inlineCallbacks
+ def test_doImplicitScheduling_OrganizerEventTimezoneDST(self):
+ """
+ Test that doImplicitScheduling delivers scheduling messages to attendees. This test
+ creates an exception close to a DST transition to make sure timezone DST handling
+ is correct.
+ """
+
+ data1 = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTAMP:20080601T120000Z
+DTSTART;TZID=America/Los_Angeles:20140302T190000
+DTEND;TZID=America/Los_Angeles:20140302T193000
+ORGANIZER;CN="User 01":mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+RRULE:FREQ=DAILY;UNTIL=20140309T075959Z
+END:VEVENT
+END:VCALENDAR
+"""
+ data2 = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTAMP:20080601T120000Z
+DTSTART;TZID=America/Los_Angeles:20140302T190000
+DTEND;TZID=America/Los_Angeles:20140302T193000
+ORGANIZER;CN="User 01":mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+RRULE:FREQ=DAILY;UNTIL=20140309T075959Z
+END:VEVENT
+BEGIN:VEVENT
+UID:12345-67890
+DTSTAMP:20080601T120000Z
+RECURRENCE-ID;TZID=America/Los_Angeles:20140308T190000
+DTSTART;TZID=America/Los_Angeles:20140308T190000
+DTEND;TZID=America/Los_Angeles:20140308T193000
+ORGANIZER;CN="User 01":mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+"""
+ TimezoneCache.create()
+
+ yield self._createCalendarObject(data1, "user01", "test.ics")
+
+ yield self._setCalendarData(data2, "user01", "test.ics")
+
+ list2 = (yield self._listCalendarObjects("user02"))
+ self.assertEqual(len(list2), 1)
+ self.assertTrue(list2[0].startswith(hashlib.md5("12345-67890").hexdigest()))
+
+ list2 = (yield self._listCalendarObjects("user02", "inbox"))
+ self.assertEqual(len(list2), 2)
+ self.assertTrue(list2[0].startswith(hashlib.md5("12345-67890").hexdigest()))
+ self.assertTrue(list2[1].startswith(hashlib.md5("12345-67890").hexdigest()))
</ins></span></pre>
</div>
</div>
</body>
</html>