<!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>[14244] CalDAVTester/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/14244">14244</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 08:20:06 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Test updates for sequence handling to cope with with async iTIP messaging.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkREADMEtxt">CalDAVTester/trunk/README.txt</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVavailability17xml">CalDAVTester/trunk/Resource/CalDAV/availability/17.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVavailability19ics">CalDAVTester/trunk/Resource/CalDAV/availability/19.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVavailability4ics">CalDAVTester/trunk/Resource/CalDAV/availability/4.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitattendeedeleterecurringdeleteinstance13ics">CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-delete-instance/13.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitattendeedeleterecurringdeleteinstance14ics">CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-delete-instance/14.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitattendeedeleterecurringmaster13ics">CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/13.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitattendeedeleterecurringmaster14ics">CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/14.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitattendeedeleterecurringnomaster13ics">CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-no-master/13.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitattendeedeleterecurringnomaster14ics">CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-no-master/14.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitauto4suite23ics">CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/3.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitauto4suite33ics">CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/3.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitpartstatchangerecur11ics">CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/11.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitrecur1allday7ics">CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/7.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitrecur1override_request11ics">CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/11.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitrecur1override_request12ics">CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/12.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitrecur1override_request7ics">CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/7.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitrecur1override_request8ics">CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/8.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitrecur2invite23ics">CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/3.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitrescheduleoverridden8ics">CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/8.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitscenario1perattendeexdash6ics">CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/6.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitscenario1perattendeexdash7ics">CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/7.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitscenario1perattendeexdash8ics">CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/8.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitscenario1simple7ics">CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/7.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitscenario1simple8ics">CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/8.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVimplicitscenario1simple9ics">CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/9.ics</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVavailabilityxml">CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVimplicitscenario1xml">CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVpretestxml">CalDAVTester/trunk/scripts/tests/CalDAV/pretest.xml</a></li>
<li><a href="#CalDAVTestertrunkverifierscalendarDataMatchpy">CalDAVTester/trunk/verifiers/calendarDataMatch.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkREADMEtxt"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/README.txt (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -343,6 +343,21 @@
</span><span class="cx"> the relative path for the file containing the request body
</span><span class="cx"> data.
</span><span class="cx">
</span><ins>+ 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.
+
</ins><span class="cx"> ELEMENT <substitute>
</span><span class="cx"> a set of substitution variables to use on this data only.
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVavailability17xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/availability/17.xml (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> UID:20061005T133225Z-00001-A-availability@example.com
</span><span class="cx"> DTSTAMP:20061005T133225Z
</span><span class="cx"> SUMMARY:Monday to Friday from 9:00 to 17:00
</span><del>-DTSTART;TZID=America/Montreal:$now.year.0:0103T090000
-DTEND;TZID=America/Montreal:$now.year.0:0103T170000
</del><ins>+DTSTART;TZID=America/Montreal:$now.year.0:0105T090000
+DTEND;TZID=America/Montreal:$now.year.0:0105T170000
</ins><span class="cx"> RRULE:FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR
</span><span class="cx"> END:AVAILABLE
</span><span class="cx"> END:VAVAILABILITY
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVavailability19ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/availability/19.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> UID:20060110T231240Z-4011c71-187-6f73-fb
</span><span class="cx"> ORGANIZER;CN=$username1::$cuaddr1:
</span><span class="cx"> ATTENDEE;CN=$username1::$cuaddr1:
</span><del>-DTSTART:$now.year.1:0102T000000Z
</del><ins>+DTSTART:$now.year.1:0104T000000Z
</ins><span class="cx"> DTSTAMP:20060309T185105Z
</span><del>-DTEND:$now.year.1:0103T000000Z
</del><ins>+DTEND:$now.year.1:0105T000000Z
</ins><span class="cx"> END:VFREEBUSY
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVavailability4ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/availability/4.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> BEGIN:VEVENT
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="cx"> CREATED:20060101T150000Z
</span><del>-DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
</del><ins>+DTSTART;TZID=US/Eastern:$now.year.1:0104T120000
</ins><span class="cx"> DURATION:PT1H
</span><span class="cx"> SUMMARY:event 1
</span><span class="cx"> UID:$uid1:
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitattendeedeleterecurringdeleteinstance13ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-delete-instance/13.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
</span><span class="cx"> ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</span><span class="cx"> RRULE:FREQ=DAILY
</span><del>-SEQUENCE:2
</del><ins>+SEQUENCE:1
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="lines">@@ -60,6 +60,6 @@
</span><span class="cx"> ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
</span><span class="cx"> ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
</span><span class="cx"> ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</span><del>-SEQUENCE:2
</del><ins>+SEQUENCE:1
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitattendeedeleterecurringdeleteinstance14ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-delete-instance/14.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -47,6 +47,6 @@
</span><span class="cx"> ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
</span><span class="cx"> ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
</span><span class="cx"> ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</span><del>-SEQUENCE:2
</del><ins>+SEQUENCE:1
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitattendeedeleterecurringmaster13ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/13.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
</span><span class="cx"> ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</span><span class="cx"> RRULE:FREQ=DAILY
</span><del>-SEQUENCE:2
</del><ins>+SEQUENCE:1
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitattendeedeleterecurringmaster14ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/14.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
</span><span class="cx"> ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</span><span class="cx"> RRULE:FREQ=DAILY
</span><del>-SEQUENCE:2
</del><ins>+SEQUENCE:1
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitattendeedeleterecurringnomaster13ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-no-master/13.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
</span><span class="cx"> ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</span><span class="cx"> RRULE:FREQ=DAILY
</span><del>-SEQUENCE:2
</del><ins>+SEQUENCE:1
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="lines">@@ -60,6 +60,6 @@
</span><span class="cx"> ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
</span><span class="cx"> ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
</span><span class="cx"> ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</span><del>-SEQUENCE:2
</del><ins>+SEQUENCE:1
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitattendeedeleterecurringnomaster14ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-no-master/14.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -47,6 +47,6 @@
</span><span class="cx"> ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
</span><span class="cx"> ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
</span><span class="cx"> ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</span><del>-SEQUENCE:2
</del><ins>+SEQUENCE:1
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitauto4suite23ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite2/3.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -12,7 +12,6 @@
</span><span class="cx"> DTSTAMP:20060309T185105Z
</span><span class="cx"> ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</span><span class="cx"> RRULE:FREQ=DAILY;COUNT=5
</span><del>-SEQUENCE:1
</del><span class="cx"> SUMMARY:Recurring event
</span><span class="cx"> TRANSP:OPAQUE
</span><span class="cx"> END:VEVENT
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitauto4suite33ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto4/suite3/3.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -13,7 +13,6 @@
</span><span class="cx"> ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</span><span class="cx"> RRULE:FREQ=DAILY;COUNT=5
</span><span class="cx"> EXDATE:$now.4:T200000Z
</span><del>-SEQUENCE:2
</del><span class="cx"> SUMMARY:Recurring event
</span><span class="cx"> TRANSP:OPAQUE
</span><span class="cx"> END:VEVENT
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitpartstatchangerecur11ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/11.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="cx"> ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
</span><span class="cx"> RRULE:FREQ=DAILY;COUNT=100
</span><del>-SEQUENCE:2
</del><ins>+SEQUENCE:1
</ins><span class="cx"> SUMMARY:event 1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitrecur1allday7ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/allday/7.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="cx"> ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
</span><del>-SEQUENCE:1
</del><span class="cx"> SUMMARY:event 1
</span><span class="cx"> TRANSP:TRANSPARENT
</span><span class="cx"> END:VEVENT
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitrecur1override_request11ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/11.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -24,19 +24,6 @@
</span><span class="cx"> BEGIN:VEVENT
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="cx"> CREATED:20060101T150000Z
</span><del>-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
</del><span class="cx"> DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> SEQUENCE:2
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitrecur1override_request12ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/12.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
</span><span class="cx"> DURATION:PT1H
</span><del>-SEQUENCE:2
</del><span class="cx"> SUMMARY:event 1
</span><span class="cx"> UID:$uid1:
</span><span class="cx"> ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitrecur1override_request7ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/7.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -24,19 +24,6 @@
</span><span class="cx"> BEGIN:VEVENT
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="cx"> CREATED:20060101T150000Z
</span><del>-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
</del><span class="cx"> DTSTART;TZID=US/Eastern:$now.year.1:0102T110000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> SEQUENCE:1
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitrecur1override_request8ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur1/override_request/8.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
</span><span class="cx"> DURATION:PT1H
</span><del>-SEQUENCE:1
</del><span class="cx"> SUMMARY:event 1
</span><span class="cx"> UID:$uid1:
</span><span class="cx"> ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitrecur2invite23ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/recur2/invite2/3.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="cx"> ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
</span><span class="cx"> RRULE:FREQ=DAILY;COUNT=5
</span><del>-SEQUENCE:1
</del><span class="cx"> SUMMARY:event 1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitrescheduleoverridden8ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/reschedule/overridden/8.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="cx"> ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</span><del>-SEQUENCE:1
</del><span class="cx"> SUMMARY:event 1
</span><span class="cx"> RRULE:FREQ=DAILY;COUNT=5
</span><span class="cx"> END:VEVENT
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitscenario1perattendeexdash6ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/6.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
</span><del>-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:
</del><ins>+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="cx"> ORGANIZER;CN=$username1::$cuaddr1:
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitscenario1perattendeexdash7ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/7.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
</span><del>-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
</del><ins>+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="cx"> ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitscenario1perattendeexdash8ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/per-attendee-x-dash/8.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
</span><del>-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
</del><ins>+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="cx"> ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitscenario1simple7ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/7.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
</span><del>-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:
</del><ins>+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$cuaddr2:
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="cx"> ORGANIZER;CN=$username1::$cuaddr1:
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitscenario1simple8ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/8.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
</span><del>-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
</del><ins>+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="cx"> ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVimplicitscenario1simple9ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scenario1/simple/9.ics (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
</span><del>-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
</del><ins>+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> DTSTAMP:20051222T205953Z
</span><span class="cx"> ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVavailabilityxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -494,9 +494,9 @@
</span><span class="cx"> <callback>dataString</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>contains</name>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVimplicitscenario1xml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario1.xml (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -278,7 +278,6 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}master</value>
</span><del>- <value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property[@name="ATTENDEE"]</value>
</del><span class="cx"> <value>$verify-property-prefix:/{$CS:}schedule-changes/{$CS:}action/{$CS:}update/{$CS:}recurrence/{$CS:}changes/{$CS:}changed-property[@name="SUMMARY"]</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -2054,7 +2053,7 @@
</span><span class="cx"> <ruri>$inboxpath2:/</ruri>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='16'>
</del><ins>+ <test name='11'>
</ins><span class="cx"> <description>Attendee has data - X- preserved</description>
</span><span class="cx"> <request user="$userid2:" pswd="$pswd2:">
</span><span class="cx"> <method>GETNEW</method>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVpretestxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/pretest.xml (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>PROPFIND of basic properties depth=0</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPFIND</method>
</span></span></pre></div>
<a id="CalDAVTestertrunkverifierscalendarDataMatchpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/calendarDataMatch.py (14243 => 14244)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx">
</span><span class="cx"> from difflib import unified_diff
</span><span class="cx"> from pycalendar.icalendar.calendar import Calendar
</span><ins>+from pycalendar.icalendar.componentrecur import ComponentRecur
</ins><span class="cx"> from pycalendar.parameter import Parameter
</span><span class="cx"> import os
</span><span class="cx">
</span><span class="lines">@@ -40,6 +41,7 @@
</span><span class="cx"> filters.append("ORGANIZER:EMAIL")
</span><span class="cx"> filters.append("ATTENDEE:X-CALENDARSERVER-DTSTAMP")
</span><span class="cx"> filters.append("ATTENDEE:X-CALENDARSERVER-AUTO")
</span><ins>+ filters.append("ATTENDEE:X-CALENDARSERVER-RESET-PARTSTAT")
</ins><span class="cx"> filters.append("CALSCALE")
</span><span class="cx"> filters.append("PRODID")
</span><span class="cx"> filters.append("DTSTAMP")
</span><span class="lines">@@ -116,15 +118,55 @@
</span><span class="cx"> if property.getName() == filter:
</span><span class="cx"> component.removeProperty(property)
</span><span class="cx">
</span><ins>+ 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)
+
</ins><span class="cx"> try:
</span><span class="cx"> format = Calendar.sFormatJSON if is_json else Calendar.sFormatText
</span><span class="cx">
</span><span class="cx"> resp_calendar = Calendar.parseData(respdata, format=format)
</span><span class="cx"> removePropertiesParameters(resp_calendar)
</span><del>- respdata = resp_calendar.getText(includeTimezones=Calendar.NO_TIMEZONES, format=format)
</del><span class="cx">
</span><span class="cx"> data_calendar = Calendar.parseData(data, format=format)
</span><span class="cx"> removePropertiesParameters(data_calendar)
</span><ins>+
+ reconcileRecurrenceOverrides(resp_calendar, data_calendar)
+
+ respdata = resp_calendar.getText(includeTimezones=Calendar.NO_TIMEZONES, format=format)
</ins><span class="cx"> data = data_calendar.getText(includeTimezones=Calendar.NO_TIMEZONES, format=format)
</span><span class="cx">
</span><span class="cx"> result = resp_calendar == data_calendar
</span></span></pre>
</div>
</div>
</body>
</html>