<!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>[13573] 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/13573">13573</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-05-30 08:50:38 -0700 (Fri, 30 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure group attendees are never sent scheduling messages (but report their schedule status as success). Use a different CUTYPE
for expanded group attendees to avoid clients removing them. Make sure group expansion is on in -test plist.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkconfcaldavdtestplist">CalendarServer/trunk/conf/caldavd-test.plist</a></li>
<li><a href="#CalendarServertrunktwistedcaldavicalpy">CalendarServer/trunk/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingcaldavschedulerpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingcuaddresspy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/cuaddress.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimplicitpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduleschedulerpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavwhogroupspy">CalendarServer/trunk/txdav/who/groups.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_group_attendeespy">CalendarServer/trunk/txdav/who/test/test_group_attendees.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkconfcaldavdtestplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-test.plist (13572 => 13573)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-test.plist 2014-05-30 02:37:00 UTC (rev 13572)
+++ CalendarServer/trunk/conf/caldavd-test.plist 2014-05-30 15:50:38 UTC (rev 13573)
</span><span class="lines">@@ -1010,7 +1010,7 @@
</span><span class="cx">
</span><span class="cx"> <key>GroupAttendees</key>
</span><span class="cx"> <dict>
</span><del>- <key>GroupAttendees</key>
</del><ins>+ <key>Enabled</key>
</ins><span class="cx"> <true/>
</span><span class="cx">
</span><span class="cx"> <key>ReconciliationDelaySeconds</key>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/ical.py (13572 => 13573)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/ical.py 2014-05-30 02:37:00 UTC (rev 13572)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2014-05-30 15:50:38 UTC (rev 13573)
</span><span class="lines">@@ -3409,6 +3409,12 @@
</span><span class="cx">
</span><span class="cx"> if cutype != prop.parameterValue("CUTYPE"):
</span><span class="cx"> if cutype and cutype != "INDIVIDUAL":
</span><ins>+ # For groups we need to change the CUTYPE exposed to clients when we have server-managed
+ # group attendee expansion because some clients seem to spontaneous remove CUTYPE=GROUP
+ # for no obvious reason when the event is changed. We can't have that happen for the
+ # server-managed groups so using a different CUTYPE seems to work around that.
+ if config.GroupAttendees.Enabled and cutype == "GROUP":
+ cutype = "X-SERVER-GROUP"
</ins><span class="cx"> prop.setParameter("CUTYPE", cutype)
</span><span class="cx"> else:
</span><span class="cx"> prop.removeParameter("CUTYPE")
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingcaldavschedulerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py (13572 => 13573)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py 2014-05-30 02:37:00 UTC (rev 13572)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py 2014-05-30 15:50:38 UTC (rev 13573)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> if organizer:
</span><span class="cx"> organizerAddress = yield calendarUserFromCalendarUserAddress(organizer, self.txn)
</span><span class="cx"> if organizerAddress.hosted():
</span><del>- if organizerAddress.record.calendarsEnabled():
</del><ins>+ if organizerAddress.validOriginator():
</ins><span class="cx">
</span><span class="cx"> # Only do this check for a freebusy request. A check for an invite needs
</span><span class="cx"> # to be handled later when we know whether a new invite is being added
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingcuaddresspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/cuaddress.py (13572 => 13573)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/cuaddress.py 2014-05-30 02:37:00 UTC (rev 13572)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/cuaddress.py 2014-05-30 15:50:38 UTC (rev 13573)
</span><span class="lines">@@ -107,7 +107,15 @@
</span><span class="cx"> return self.record.calendarsEnabled() and not isinstance(self.record, TemporaryDirectoryRecord)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def getCUType(self):
+ """
+ Is this user able to receive scheduling messages.
+ A user with a temporary directory record cannot be scheduled with.
+ """
+ return self.record.getCUType()
</ins><span class="cx">
</span><ins>+
+
</ins><span class="cx"> class LocalCalendarUser(HostedCalendarUser):
</span><span class="cx"> """
</span><span class="cx"> User hosted on the current pod.
</span><span class="lines">@@ -181,10 +189,22 @@
</span><span class="cx"> directory entry.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ def __init__(self, cuaddr, record=None):
+ self.cuaddr = cuaddr
+ self.record = record
+
+
</ins><span class="cx"> def __str__(self):
</span><span class="cx"> return "Invalid calendar user: {}".format(self.cuaddr)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def hosted(self):
+ """
+ Is this user hosted on this service (this pod or any other)
+ """
+ return self.record is not None
+
+
</ins><span class="cx"> def validOriginator(self):
</span><span class="cx"> """
</span><span class="cx"> Is this user able to originate scheduling messages.
</span><span class="lines">@@ -199,7 +219,15 @@
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def getCUType(self):
+ """
+ Is this user able to receive scheduling messages.
+ A user with a temporary directory record cannot be scheduled with.
+ """
+ return self.record.getCUType() if self.record is not None else None
</ins><span class="cx">
</span><ins>+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def calendarUserFromCalendarUserAddress(cuaddr, txn):
</span><span class="cx"> """
</span><span class="lines">@@ -284,7 +312,7 @@
</span><span class="cx"> """
</span><span class="cx"> if record is not None:
</span><span class="cx"> if not record.calendarsEnabled():
</span><del>- returnValue(InvalidCalendarUser(cuaddr))
</del><ins>+ returnValue(InvalidCalendarUser(cuaddr, record))
</ins><span class="cx"> elif record.thisServer():
</span><span class="cx"> returnValue(LocalCalendarUser(cuaddr, record))
</span><span class="cx"> else:
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimplicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py (13572 => 13573)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py 2014-05-30 02:37:00 UTC (rev 13572)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py 2014-05-30 15:50:38 UTC (rev 13573)
</span><span class="lines">@@ -1250,12 +1250,17 @@
</span><span class="cx"> if attendee in self.organizerAddress.record.calendarUserAddresses:
</span><span class="cx"> continue
</span><span class="cx">
</span><ins>+ attendeeAddress = (yield calendarUserFromCalendarUserAddress(attendee, self.txn))
+
</ins><span class="cx"> # Handle split by not scheduling local attendees
</span><span class="cx"> if self.split_details is not None:
</span><del>- attendeeAddress = (yield calendarUserFromCalendarUserAddress(attendee, self.txn))
</del><span class="cx"> if type(attendeeAddress) is LocalCalendarUser:
</span><span class="cx"> continue
</span><span class="cx">
</span><ins>+ # Do not schedule with groups - ever
+ if attendeeAddress.hosted() and attendeeAddress.getCUType() == "GROUP":
+ continue
+
</ins><span class="cx"> # Generate an iTIP CANCEL message for this attendee, cancelling
</span><span class="cx"> # each instance or the whole
</span><span class="cx">
</span><span class="lines">@@ -1314,12 +1319,17 @@
</span><span class="cx"> if self.reinvites and attendee not in self.reinvites:
</span><span class="cx"> continue
</span><span class="cx">
</span><ins>+ attendeeAddress = (yield calendarUserFromCalendarUserAddress(attendee, self.txn))
+
</ins><span class="cx"> # Handle split by not scheduling local attendees
</span><span class="cx"> if self.split_details is not None:
</span><del>- attendeeAddress = (yield calendarUserFromCalendarUserAddress(attendee, self.txn))
</del><span class="cx"> if type(attendeeAddress) is LocalCalendarUser:
</span><span class="cx"> continue
</span><span class="cx">
</span><ins>+ # Do not schedule with groups - ever
+ if attendeeAddress.hosted() and attendeeAddress.getCUType() == "GROUP":
+ continue
+
</ins><span class="cx"> itipmsg = iTipGenerator.generateAttendeeRequest(self.calendar, (attendee,), self.changed_rids)
</span><span class="cx">
</span><span class="cx"> # Send scheduling message
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduleschedulerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py (13572 => 13573)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py 2014-05-30 02:37:00 UTC (rev 13572)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py 2014-05-30 15:50:38 UTC (rev 13573)
</span><span class="lines">@@ -27,7 +27,8 @@
</span><span class="cx">
</span><span class="cx"> from txdav.caldav.datastore.scheduling import addressmapping
</span><span class="cx"> from txdav.caldav.datastore.scheduling.cuaddress import LocalCalendarUser, \
</span><del>- calendarUserFromCalendarUserAddress, RemoteCalendarUser
</del><ins>+ calendarUserFromCalendarUserAddress, RemoteCalendarUser, \
+ OtherServerCalendarUser
</ins><span class="cx"> from txdav.caldav.datastore.scheduling.ischedule import xml
</span><span class="cx"> from txdav.caldav.datastore.scheduling.ischedule.dkim import DKIMVerifier, \
</span><span class="cx"> DKIMVerificationError, DKIMMissingError
</span><span class="lines">@@ -257,9 +258,19 @@
</span><span class="cx"> self.errorElements["originator-denied"],
</span><span class="cx"> "Originator cannot be local to server",
</span><span class="cx"> ))
</span><del>- else:
</del><ins>+ elif isinstance(originatorAddress, OtherServerCalendarUser):
</ins><span class="cx"> self.originator = originatorAddress
</span><span class="cx"> self._validAlternateServer(originatorAddress)
</span><ins>+ else:
+ log.error(
+ "Cannot use invalid originator: {o}",
+ o=self.originator,
+ )
+ raise HTTPError(self.errorResponse(
+ responsecode.FORBIDDEN,
+ self.errorElements["originator-denied"],
+ "Originator cannot schedule",
+ ))
</ins><span class="cx"> else:
</span><span class="cx"> if self._podding:
</span><span class="cx"> log.error(
</span><span class="lines">@@ -436,10 +447,20 @@
</span><span class="cx"> self.errorElements["organizer-denied"],
</span><span class="cx"> "Organizer is not local to server",
</span><span class="cx"> ))
</span><del>- else:
</del><ins>+ elif isinstance(organizerAddress, OtherServerCalendarUser):
</ins><span class="cx"> # Check that the origin server is the correct pod
</span><span class="cx"> self.organizer = organizerAddress
</span><span class="cx"> self._validAlternateServer(self.organizer)
</span><ins>+ else:
+ log.error(
+ "Invalid ORGANIZER in calendar data: {cal}",
+ cal=self.calendar,
+ )
+ raise HTTPError(self.errorResponse(
+ responsecode.FORBIDDEN,
+ self.errorElements["organizer-denied"],
+ "Organizer cannot schedule",
+ ))
</ins><span class="cx"> else:
</span><span class="cx"> localUser = (yield addressmapping.mapper.isCalendarUserInMyDomain(organizer))
</span><span class="cx"> if localUser:
</span><span class="lines">@@ -486,8 +507,18 @@
</span><span class="cx"> self.errorElements["attendee-denied"],
</span><span class="cx"> "Local attendee cannot send to this server",
</span><span class="cx"> ))
</span><ins>+ elif isinstance(attendeeAddress, OtherServerCalendarUser):
+ self._validAlternateServer(attendeeAddress)
</ins><span class="cx"> else:
</span><del>- self._validAlternateServer(attendeeAddress)
</del><ins>+ log.error(
+ "Invalid ATTENDEE in calendar data: {cal}",
+ cal=self.calendar,
+ )
+ raise HTTPError(self.errorResponse(
+ responsecode.FORBIDDEN,
+ self.errorElements["attendee-denied"],
+ "Attendee not allowed to schedule",
+ ))
</ins><span class="cx"> else:
</span><span class="cx"> localUser = (yield addressmapping.mapper.isCalendarUserInMyDomain(self.attendee))
</span><span class="cx"> if localUser:
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (13572 => 13573)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-05-30 02:37:00 UTC (rev 13572)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-05-30 15:50:38 UTC (rev 13573)
</span><span class="lines">@@ -1940,10 +1940,13 @@
</span><span class="cx"> if not config.GroupAttendees.Enabled:
</span><span class="cx"> returnValue(False)
</span><span class="cx">
</span><ins>+ # Note, as per ical.py/normalizeCalendarUserAddresses we change the CUTYPE from GROUP
+ # to X-SERVER-GROUP to ensure bad clients don't spontaneously remove group attendees
+ # when an event changes.
</ins><span class="cx"> attendeeProps = component.getAllAttendeeProperties()
</span><span class="cx"> groupCUAs = set([
</span><span class="cx"> attendeeProp.value() for attendeeProp in attendeeProps
</span><del>- if attendeeProp.parameterValue("CUTYPE") == "GROUP"
</del><ins>+ if attendeeProp.parameterValue("CUTYPE") == "X-SERVER-GROUP"
</ins><span class="cx"> ])
</span><span class="cx">
</span><span class="cx"> groupCUAToAttendeeMemberPropMap = {}
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/groups.py (13572 => 13573)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/groups.py 2014-05-30 02:37:00 UTC (rev 13572)
+++ CalendarServer/trunk/txdav/who/groups.py 2014-05-30 15:50:38 UTC (rev 13573)
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx">
</span><span class="cx"> membershipHashContent = hashlib.md5()
</span><span class="cx"> members = list(members)
</span><del>- members.sort(cmp=lambda x, y: cmp(x.uid, y.uid))
</del><ins>+ members.sort(key=lambda x: x.uid)
</ins><span class="cx"> for member in members:
</span><span class="cx"> membershipHashContent.update(str(member.uid))
</span><span class="cx"> membershipHash = membershipHashContent.hexdigest()
</span><span class="lines">@@ -397,7 +397,6 @@
</span><span class="cx"> rows = yield Select(
</span><span class="cx"> [gr.GROUP_UID],
</span><span class="cx"> From=gr,
</span><del>- Distinct=True,
</del><span class="cx"> Where=gr.GROUP_ID.In(
</span><span class="cx"> Select(
</span><span class="cx"> [groupAttendee.GROUP_ID],
</span><span class="lines">@@ -407,6 +406,9 @@
</span><span class="cx"> )
</span><span class="cx"> ).on(txn)
</span><span class="cx"> attendeeGroupUIDs = set([row[0] for row in rows])
</span><ins>+ self.log.info(
+ "There are {count} group attendees", count=len(attendeeGroupUIDs)
+ )
</ins><span class="cx">
</span><span class="cx"> # FIXME: is this a good place to clear out unreferenced groups?
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_group_attendeespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_group_attendees.py (13572 => 13573)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_group_attendees.py 2014-05-30 02:37:00 UTC (rev 13572)
+++ CalendarServer/trunk/txdav/who/test/test_group_attendees.py 2014-05-30 15:50:38 UTC (rev 13573)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20140101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><del>-ATTENDEE;CN=Group 02;CUTYPE=GROUP;EMAIL=group02@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000002
</del><ins>+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
</ins><span class="cx"> ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
</span><span class="cx"> ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
</span><span class="cx"> ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_unknownPUT(self):
</span><span class="cx"> """
</span><del>- Test unknown group with CUTYPE=GROUP handled
</del><ins>+ Test unknown group with CUTYPE=X-SERVER-GROUP handled
</ins><span class="cx"> """
</span><span class="cx"> calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
</span><span class="cx">
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> UID:event1@ninevah.local
</span><span class="cx"> ORGANIZER:MAILTO:user01@example.com
</span><span class="cx"> ATTENDEE:mailto:user01@example.com
</span><del>-ATTENDEE;CUTYPE=GROUP:urn:uuid:FFFFFFFF-EEEE-DDDD-CCCC-BBBBBBBBBBBB
</del><ins>+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:FFFFFFFF-EEEE-DDDD-CCCC-BBBBBBBBBBBB
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR"""
</span><span class="cx">
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20140101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><del>-ATTENDEE;CUTYPE=GROUP;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:uuid:FFFFFFFF-EEEE-DDDD-CCCC-BBBBBBBBBBBB
</del><ins>+ATTENDEE;CUTYPE=X-SERVER-GROUP;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:uuid:FFFFFFFF-EEEE-DDDD-CCCC-BBBBBBBBBBBB
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><span class="cx"> SUMMARY:event 1
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><span class="cx"> ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><span class="cx"> SUMMARY:event 1
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20140101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><del>-ATTENDEE;CN=Group 04;CUTYPE=GROUP;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000004
</del><ins>+ATTENDEE;CN=Group 04;CUTYPE=X-SERVER-GROUP;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000004
</ins><span class="cx"> ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000004";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
</span><span class="cx"> ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000004";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
</span><span class="cx"> ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000004";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
</span><span class="lines">@@ -373,9 +373,9 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20140101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 02;CUTYPE=GROUP;EMAIL=group02@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 03;CUTYPE=GROUP;EMAIL=group03@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000003
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000003
</ins><span class="cx"> ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
</span><span class="cx"> ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
</span><span class="cx"> ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20240101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><span class="cx"> SUMMARY:event 1
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20240101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
</ins><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000001";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20240101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><span class="cx"> SEQUENCE:2
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx"> groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
</span><span class="cx"> groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
</span><span class="cx"> self.assertEqual(len(groupsToRefresh), 0)
</span><del>-
</del><ins>+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> self.assertEqual(len(wps), 0)
</span><span class="cx">
</span><span class="lines">@@ -505,10 +505,10 @@
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> self.patch(CalendarDirectoryRecordMixin, "expandedMembers", unpatchedExpandedMembers)
</span><del>-
</del><ins>+
</ins><span class="cx"> groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
</span><span class="cx"> self.assertEqual(len(groupsToRefresh), 1)
</span><del>-
</del><ins>+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertEqual(len(wps), 1)
</span><span class="lines">@@ -570,7 +570,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20240101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-00000000000{0}
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:10000000-0000-0000-0000-00000000000{0}
</span><span class="cx"> SUMMARY:event {0}
</span><span class="lines">@@ -587,7 +587,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20240101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-00000000000{0}
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
</ins><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000001";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:10000000-0000-0000-0000-00000000000{0}
</span><span class="lines">@@ -606,7 +606,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20240101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-00000000000{0}
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:10000000-0000-0000-0000-00000000000{0}
</span><span class="cx"> SEQUENCE:2
</span><span class="lines">@@ -626,7 +626,7 @@
</span><span class="cx"> groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
</span><span class="cx"> groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
</span><span class="cx"> self.assertEqual(len(groupsToRefresh), 0)
</span><del>-
</del><ins>+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> self.assertEqual(len(wps), 0)
</span><span class="cx">
</span><span class="lines">@@ -649,7 +649,7 @@
</span><span class="cx">
</span><span class="cx"> groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
</span><span class="cx"> self.assertEqual(len(groupsToRefresh), 1)
</span><del>-
</del><ins>+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertEqual(len(wps), len(userRange))
</span><span class="lines">@@ -714,7 +714,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20140101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
</ins><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000001";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><span class="lines">@@ -731,7 +731,7 @@
</span><span class="cx">
</span><span class="cx"> groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
</span><span class="cx"> self.assertEqual(len(groupsToRefresh), 0)
</span><del>-
</del><ins>+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> if len(wps): # This is needed because the test currently fails and does actually create job items we have to wait for
</span><span class="cx"> yield self.commit()
</span><span class="lines">@@ -792,7 +792,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20240101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
</ins><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000001";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><span class="lines">@@ -810,7 +810,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20140101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><span class="cx"> SEQUENCE:1
</span><span class="lines">@@ -833,7 +833,7 @@
</span><span class="cx">
</span><span class="cx"> groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
</span><span class="cx"> self.assertEqual(len(groupsToRefresh), 1)
</span><del>-
</del><ins>+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertEqual(len(wps), 1)
</span><span class="lines">@@ -923,7 +923,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20120101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
</ins><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000001";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><span class="lines">@@ -942,7 +942,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20120101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
</ins><span class="cx"> CREATED:20060101T150000Z
</span><span class="cx"> ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
</span><span class="cx"> RRULE:FREQ=DAILY;UNTIL=20140101T100000
</span><span class="lines">@@ -966,7 +966,7 @@
</span><span class="cx">
</span><span class="cx"> groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
</span><span class="cx"> self.assertEqual(len(groupsToRefresh), 1)
</span><del>-
</del><ins>+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertEqual(len(wps), 1)
</span><span class="lines">@@ -995,7 +995,6 @@
</span><span class="cx"> self.assertEqual(len(wps), 0)
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_groupRemovalFromDirectory(self):
</span><span class="cx"> """
</span><span class="lines">@@ -1040,9 +1039,9 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20240101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 02;CUTYPE=GROUP;EMAIL=group02@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 03;CUTYPE=GROUP;EMAIL=group03@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000003
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000003
</ins><span class="cx"> ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
</span><span class="cx"> ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
</span><span class="cx"> ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
</span><span class="lines">@@ -1062,9 +1061,9 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20240101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 02;CUTYPE=GROUP;EMAIL=group02@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 03;CUTYPE=GROUP;EMAIL=group03@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000003
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000003
</ins><span class="cx"> ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
</span><span class="cx"> ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
</span><span class="cx"> ATTENDEE;CN=User 09;EMAIL=user09@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009
</span><span class="lines">@@ -1085,9 +1084,9 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20240101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><del>-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 02;CUTYPE=GROUP;EMAIL=group02@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 03;CUTYPE=GROUP;EMAIL=group03@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000003
</del><ins>+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000003
</ins><span class="cx"> ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
</span><span class="cx"> ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
</span><span class="cx"> ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
</span><span class="lines">@@ -1127,7 +1126,7 @@
</span><span class="cx"> groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
</span><span class="cx"> groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
</span><span class="cx"> self.assertEqual(len(groupsToRefresh), 3)
</span><del>-
</del><ins>+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertEqual(len(wps), 1)
</span><span class="lines">@@ -1219,8 +1218,8 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20240101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><del>-ATTENDEE;CN=Group 02;CUTYPE=GROUP;EMAIL=group02@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 03;CUTYPE=GROUP;EMAIL=group03@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000003
</del><ins>+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000003
</ins><span class="cx"> ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
</span><span class="cx"> ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
</span><span class="cx"> ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
</span><span class="lines">@@ -1257,7 +1256,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:20240101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
</span><del>-ATTENDEE;CN=Group 02;CUTYPE=GROUP;EMAIL=group02@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000002
</del><ins>+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
</ins><span class="cx"> ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
</span><span class="cx"> ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
</span><span class="cx"> ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
</span><span class="lines">@@ -1286,7 +1285,7 @@
</span><span class="cx"> groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
</span><span class="cx"> groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
</span><span class="cx"> self.assertEqual(len(groupsToRefresh), 2)
</span><del>-
</del><ins>+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertEqual(len(wps), 1)
</span></span></pre>
</div>
</div>
</body>
</html>