
<!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>[13759] CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test</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/13759">13759</a></dd>

<dt>Author</dt> <dd>gaya@apple.com</dd>

<dt>Date</dt> <dd>2014-07-15 17:13:57 -0700 (Tue, 15 Jul 2014)</dd>

</dl>


<h3>Log Message</h3>

<pre>use human-readable uids</pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavwhotesttest_group_attendeespy">CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/test_group_attendees.py</a></li>

</ul>


<h3>Added Paths</h3>

<ul>

<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavwhotestaccountsgroupAccountsxml">CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAccounts.xml</a></li>

</ul>


<h3>Removed Paths</h3>

<ul>

<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavwhotestaccountsgroupAttendeeAccountsxml">CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAttendeeAccounts.xml</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="CalendarServerbranchesusersgayagroupsharee2txdavwhotestaccountsgroupAccountsxmlfromrev13757CalendarServerbranchesusersgayagroupsharee2txdavwhotestaccountsgroupAttendeeAccountsxml"></a>

<div class="copfile"><h4>Copied: CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAccounts.xml (from rev 13757, CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAttendeeAccounts.xml) (0 => 13759)</h4>

<pre class="diff"><span>

<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAccounts.xml                                (rev 0)

+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAccounts.xml        2014-07-16 00:13:57 UTC (rev 13759)

</span><span class="lines">@@ -0,0 +1,139 @@

</span><ins>+&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;

+

+&lt;!--

+Copyright (c) 2006-2014 Apple Inc. All rights reserved.

+

+Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);

+you may not use this file except in compliance with the License.

+You may obtain a copy of the License at

+

+    http://www.apache.org/licenses/LICENSE-2.0

+

+Unless required by applicable law or agreed to in writing, software

+distributed under the License is distributed on an &quot;AS IS&quot; BASIS,

+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+See the License for the specific language governing permissions and

+limitations under the License.

+ --&gt;

+

+&lt;!DOCTYPE accounts SYSTEM &quot;accounts.dtd&quot;&gt;

+

+&lt;directory realm=&quot;Test Realm&quot;&gt;

+        &lt;record type=&quot;user&quot;&gt;

+            &lt;short-name&gt;user01&lt;/short-name&gt;

+            &lt;uid&gt;user01&lt;/uid&gt;

+            &lt;guid&gt;10000000-0000-0000-0000-000000000001&lt;/guid&gt;

+            &lt;password&gt;user01&lt;/password&gt;

+            &lt;full-name&gt;User 01&lt;/full-name&gt;

+            &lt;email&gt;user01@example.com&lt;/email&gt;

+        &lt;/record&gt;

+        &lt;record type=&quot;user&quot;&gt;

+            &lt;short-name&gt;user02&lt;/short-name&gt;

+            &lt;uid&gt;user02&lt;/uid&gt;

+            &lt;guid&gt;10000000-0000-0000-0000-000000000002&lt;/guid&gt;

+            &lt;password&gt;user02&lt;/password&gt;

+            &lt;full-name&gt;User 02&lt;/full-name&gt;

+            &lt;email&gt;user02@example.com&lt;/email&gt;

+        &lt;/record&gt;

+        &lt;record type=&quot;user&quot;&gt;

+            &lt;short-name&gt;user03&lt;/short-name&gt;

+            &lt;uid&gt;user03&lt;/uid&gt;

+            &lt;guid&gt;10000000-0000-0000-0000-000000000003&lt;/guid&gt;

+            &lt;password&gt;user03&lt;/password&gt;

+            &lt;full-name&gt;User 03&lt;/full-name&gt;

+            &lt;email&gt;user03@example.com&lt;/email&gt;

+        &lt;/record&gt;

+        &lt;record type=&quot;user&quot;&gt;

+            &lt;short-name&gt;user04&lt;/short-name&gt;

+            &lt;uid&gt;user04&lt;/uid&gt;

+            &lt;guid&gt;10000000-0000-0000-0000-000000000004&lt;/guid&gt;

+            &lt;password&gt;user04&lt;/password&gt;

+            &lt;full-name&gt;User 04&lt;/full-name&gt;

+            &lt;email&gt;user04@example.com&lt;/email&gt;

+        &lt;/record&gt;

+        &lt;record type=&quot;user&quot;&gt;

+            &lt;short-name&gt;user05&lt;/short-name&gt;

+            &lt;uid&gt;user05&lt;/uid&gt;

+            &lt;guid&gt;10000000-0000-0000-0000-000000000005&lt;/guid&gt;

+            &lt;password&gt;user05&lt;/password&gt;

+            &lt;full-name&gt;User 05&lt;/full-name&gt;

+            &lt;email&gt;user05@example.com&lt;/email&gt;

+        &lt;/record&gt;

+        &lt;record type=&quot;user&quot;&gt;

+            &lt;short-name&gt;user06&lt;/short-name&gt;

+            &lt;uid&gt;user06&lt;/uid&gt;

+            &lt;guid&gt;10000000-0000-0000-0000-000000000006&lt;/guid&gt;

+            &lt;password&gt;user06&lt;/password&gt;

+            &lt;full-name&gt;User 06&lt;/full-name&gt;

+            &lt;email&gt;user06@example.com&lt;/email&gt;

+        &lt;/record&gt;

+        &lt;record type=&quot;user&quot;&gt;

+            &lt;short-name&gt;user07&lt;/short-name&gt;

+            &lt;uid&gt;user07&lt;/uid&gt;

+            &lt;guid&gt;10000000-0000-0000-0000-000000000007&lt;/guid&gt;

+            &lt;password&gt;user07&lt;/password&gt;

+            &lt;full-name&gt;User 07&lt;/full-name&gt;

+            &lt;email&gt;user07@example.com&lt;/email&gt;

+        &lt;/record&gt;

+        &lt;record type=&quot;user&quot;&gt;

+            &lt;short-name&gt;user08&lt;/short-name&gt;

+            &lt;uid&gt;user08&lt;/uid&gt;

+            &lt;guid&gt;10000000-0000-0000-0000-000000000008&lt;/guid&gt;

+            &lt;password&gt;user08&lt;/password&gt;

+            &lt;full-name&gt;User 08&lt;/full-name&gt;

+            &lt;email&gt;user08@example.com&lt;/email&gt;

+        &lt;/record&gt;

+        &lt;record type=&quot;user&quot;&gt;

+            &lt;short-name&gt;user09&lt;/short-name&gt;

+            &lt;uid&gt;user09&lt;/uid&gt;

+            &lt;guid&gt;10000000-0000-0000-0000-000000000009&lt;/guid&gt;

+            &lt;password&gt;user09&lt;/password&gt;

+            &lt;full-name&gt;User 09&lt;/full-name&gt;

+            &lt;email&gt;user09@example.com&lt;/email&gt;

+        &lt;/record&gt;

+        &lt;record type=&quot;user&quot;&gt;

+            &lt;short-name&gt;user10&lt;/short-name&gt;

+            &lt;uid&gt;user10&lt;/uid&gt;

+            &lt;guid&gt;10000000-0000-0000-0000-000000000010&lt;/guid&gt;

+            &lt;password&gt;user10&lt;/password&gt;

+            &lt;full-name&gt;User 10&lt;/full-name&gt;

+            &lt;email&gt;user10@example.com&lt;/email&gt;

+        &lt;/record&gt;

+        &lt;record type=&quot;group&quot;&gt;

+            &lt;short-name&gt;group01&lt;/short-name&gt;

+            &lt;uid&gt;group01&lt;/uid&gt;

+            &lt;guid&gt;20000000-0000-0000-0000-000000000001&lt;/guid&gt;

+            &lt;full-name&gt;Group 01&lt;/full-name&gt;

+            &lt;email&gt;group01@example.com&lt;/email&gt;

+            &lt;member-uid&gt;user01&lt;/member-uid&gt;

+        &lt;/record&gt;

+        &lt;record type=&quot;group&quot;&gt;

+            &lt;short-name&gt;group02&lt;/short-name&gt;

+            &lt;uid&gt;group02&lt;/uid&gt;

+            &lt;guid&gt;20000000-0000-0000-0000-000000000002&lt;/guid&gt;

+            &lt;full-name&gt;Group 02&lt;/full-name&gt;

+            &lt;email&gt;group02@example.com&lt;/email&gt;

+            &lt;member-uid&gt;user06&lt;/member-uid&gt;

+            &lt;member-uid&gt;user07&lt;/member-uid&gt;

+            &lt;member-uid&gt;user08&lt;/member-uid&gt;

+        &lt;/record&gt;

+        &lt;record type=&quot;group&quot;&gt;

+            &lt;short-name&gt;group03&lt;/short-name&gt;

+            &lt;uid&gt;group03&lt;/uid&gt;

+            &lt;guid&gt;20000000-0000-0000-0000-000000000003&lt;/guid&gt;

+            &lt;full-name&gt;Group 03&lt;/full-name&gt;

+            &lt;email&gt;group03@example.com&lt;/email&gt;

+            &lt;member-uid&gt;user07&lt;/member-uid&gt;

+            &lt;member-uid&gt;user08&lt;/member-uid&gt;

+            &lt;member-uid&gt;user09&lt;/member-uid&gt;

+        &lt;/record&gt;

+        &lt;record type=&quot;group&quot;&gt;

+            &lt;short-name&gt;group04&lt;/short-name&gt;

+            &lt;uid&gt;group04&lt;/uid&gt;

+            &lt;guid&gt;20000000-0000-0000-0000-000000000004&lt;/guid&gt;

+            &lt;full-name&gt;Group 04&lt;/full-name&gt;

+            &lt;member-uid&gt;group02&lt;/member-uid&gt;

+            &lt;member-uid&gt;group03&lt;/member-uid&gt;

+            &lt;member-uid&gt;user10&lt;/member-uid&gt;

+        &lt;/record&gt;

+&lt;/directory&gt;

</ins></span></pre></div>

<a id="CalendarServerbranchesusersgayagroupsharee2txdavwhotestaccountsgroupAttendeeAccountsxml"></a>

<div class="delfile"><h4>Deleted: CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAttendeeAccounts.xml (13758 => 13759)</h4>

<pre class="diff"><span>

<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAttendeeAccounts.xml        2014-07-16 00:07:13 UTC (rev 13758)

+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAttendeeAccounts.xml        2014-07-16 00:13:57 UTC (rev 13759)

</span><span class="lines">@@ -1,139 +0,0 @@

</span><del>-&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;

-

-&lt;!--

-Copyright (c) 2006-2014 Apple Inc. All rights reserved.

-

-Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);

-you may not use this file except in compliance with the License.

-You may obtain a copy of the License at

-

-    http://www.apache.org/licenses/LICENSE-2.0

-

-Unless required by applicable law or agreed to in writing, software

-distributed under the License is distributed on an &quot;AS IS&quot; BASIS,

-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-See the License for the specific language governing permissions and

-limitations under the License.

- --&gt;

-

-&lt;!DOCTYPE accounts SYSTEM &quot;accounts.dtd&quot;&gt;

-

-&lt;directory realm=&quot;Test Realm&quot;&gt;

-        &lt;record type=&quot;user&quot;&gt;

-            &lt;short-name&gt;user01&lt;/short-name&gt;

-            &lt;uid&gt;10000000-0000-0000-0000-000000000001&lt;/uid&gt;

-            &lt;guid&gt;10000000-0000-0000-0000-000000000001&lt;/guid&gt;

-            &lt;password&gt;user01&lt;/password&gt;

-            &lt;full-name&gt;User 01&lt;/full-name&gt;

-            &lt;email&gt;user01@example.com&lt;/email&gt;

-        &lt;/record&gt;

-        &lt;record type=&quot;user&quot;&gt;

-            &lt;short-name&gt;user02&lt;/short-name&gt;

-            &lt;uid&gt;10000000-0000-0000-0000-000000000002&lt;/uid&gt;

-            &lt;guid&gt;10000000-0000-0000-0000-000000000002&lt;/guid&gt;

-            &lt;password&gt;user02&lt;/password&gt;

-            &lt;full-name&gt;User 02&lt;/full-name&gt;

-            &lt;email&gt;user02@example.com&lt;/email&gt;

-        &lt;/record&gt;

-        &lt;record type=&quot;user&quot;&gt;

-            &lt;short-name&gt;user03&lt;/short-name&gt;

-            &lt;uid&gt;10000000-0000-0000-0000-000000000003&lt;/uid&gt;

-            &lt;guid&gt;10000000-0000-0000-0000-000000000003&lt;/guid&gt;

-            &lt;password&gt;user03&lt;/password&gt;

-            &lt;full-name&gt;User 03&lt;/full-name&gt;

-            &lt;email&gt;user03@example.com&lt;/email&gt;

-        &lt;/record&gt;

-        &lt;record type=&quot;user&quot;&gt;

-            &lt;short-name&gt;user04&lt;/short-name&gt;

-            &lt;uid&gt;10000000-0000-0000-0000-000000000004&lt;/uid&gt;

-            &lt;guid&gt;10000000-0000-0000-0000-000000000004&lt;/guid&gt;

-            &lt;password&gt;user04&lt;/password&gt;

-            &lt;full-name&gt;User 04&lt;/full-name&gt;

-            &lt;email&gt;user04@example.com&lt;/email&gt;

-        &lt;/record&gt;

-        &lt;record type=&quot;user&quot;&gt;

-            &lt;short-name&gt;user05&lt;/short-name&gt;

-            &lt;uid&gt;10000000-0000-0000-0000-000000000005&lt;/uid&gt;

-            &lt;guid&gt;10000000-0000-0000-0000-000000000005&lt;/guid&gt;

-            &lt;password&gt;user05&lt;/password&gt;

-            &lt;full-name&gt;User 05&lt;/full-name&gt;

-            &lt;email&gt;user05@example.com&lt;/email&gt;

-        &lt;/record&gt;

-        &lt;record type=&quot;user&quot;&gt;

-            &lt;short-name&gt;user06&lt;/short-name&gt;

-            &lt;uid&gt;10000000-0000-0000-0000-000000000006&lt;/uid&gt;

-            &lt;guid&gt;10000000-0000-0000-0000-000000000006&lt;/guid&gt;

-            &lt;password&gt;user06&lt;/password&gt;

-            &lt;full-name&gt;User 06&lt;/full-name&gt;

-            &lt;email&gt;user06@example.com&lt;/email&gt;

-        &lt;/record&gt;

-        &lt;record type=&quot;user&quot;&gt;

-            &lt;short-name&gt;user07&lt;/short-name&gt;

-            &lt;uid&gt;10000000-0000-0000-0000-000000000007&lt;/uid&gt;

-            &lt;guid&gt;10000000-0000-0000-0000-000000000007&lt;/guid&gt;

-            &lt;password&gt;user07&lt;/password&gt;

-            &lt;full-name&gt;User 07&lt;/full-name&gt;

-            &lt;email&gt;user07@example.com&lt;/email&gt;

-        &lt;/record&gt;

-        &lt;record type=&quot;user&quot;&gt;

-            &lt;short-name&gt;user08&lt;/short-name&gt;

-            &lt;uid&gt;10000000-0000-0000-0000-000000000008&lt;/uid&gt;

-            &lt;guid&gt;10000000-0000-0000-0000-000000000008&lt;/guid&gt;

-            &lt;password&gt;user08&lt;/password&gt;

-            &lt;full-name&gt;User 08&lt;/full-name&gt;

-            &lt;email&gt;user08@example.com&lt;/email&gt;

-        &lt;/record&gt;

-        &lt;record type=&quot;user&quot;&gt;

-            &lt;short-name&gt;user09&lt;/short-name&gt;

-            &lt;uid&gt;10000000-0000-0000-0000-000000000009&lt;/uid&gt;

-            &lt;guid&gt;10000000-0000-0000-0000-000000000009&lt;/guid&gt;

-            &lt;password&gt;user09&lt;/password&gt;

-            &lt;full-name&gt;User 09&lt;/full-name&gt;

-            &lt;email&gt;user09@example.com&lt;/email&gt;

-        &lt;/record&gt;

-        &lt;record type=&quot;user&quot;&gt;

-            &lt;short-name&gt;user10&lt;/short-name&gt;

-            &lt;uid&gt;10000000-0000-0000-0000-000000000010&lt;/uid&gt;

-            &lt;guid&gt;10000000-0000-0000-0000-000000000010&lt;/guid&gt;

-            &lt;password&gt;user10&lt;/password&gt;

-            &lt;full-name&gt;User 10&lt;/full-name&gt;

-            &lt;email&gt;user10@example.com&lt;/email&gt;

-        &lt;/record&gt;

-        &lt;record type=&quot;group&quot;&gt;

-            &lt;short-name&gt;group01&lt;/short-name&gt;

-            &lt;uid&gt;20000000-0000-0000-0000-000000000001&lt;/uid&gt;

-            &lt;guid&gt;20000000-0000-0000-0000-000000000001&lt;/guid&gt;

-            &lt;full-name&gt;Group 01&lt;/full-name&gt;

-            &lt;email&gt;group01@example.com&lt;/email&gt;

-            &lt;member-uid&gt;10000000-0000-0000-0000-000000000001&lt;/member-uid&gt;

-        &lt;/record&gt;

-        &lt;record type=&quot;group&quot;&gt;

-            &lt;short-name&gt;group02&lt;/short-name&gt;

-            &lt;uid&gt;20000000-0000-0000-0000-000000000002&lt;/uid&gt;

-            &lt;guid&gt;20000000-0000-0000-0000-000000000002&lt;/guid&gt;

-            &lt;full-name&gt;Group 02&lt;/full-name&gt;

-            &lt;email&gt;group02@example.com&lt;/email&gt;

-            &lt;member-uid&gt;10000000-0000-0000-0000-000000000006&lt;/member-uid&gt;

-            &lt;member-uid&gt;10000000-0000-0000-0000-000000000007&lt;/member-uid&gt;

-            &lt;member-uid&gt;10000000-0000-0000-0000-000000000008&lt;/member-uid&gt;

-        &lt;/record&gt;

-        &lt;record type=&quot;group&quot;&gt;

-            &lt;short-name&gt;group03&lt;/short-name&gt;

-            &lt;uid&gt;20000000-0000-0000-0000-000000000003&lt;/uid&gt;

-            &lt;guid&gt;20000000-0000-0000-0000-000000000003&lt;/guid&gt;

-            &lt;full-name&gt;Group 03&lt;/full-name&gt;

-            &lt;email&gt;group03@example.com&lt;/email&gt;

-            &lt;member-uid&gt;10000000-0000-0000-0000-000000000007&lt;/member-uid&gt;

-            &lt;member-uid&gt;10000000-0000-0000-0000-000000000008&lt;/member-uid&gt;

-            &lt;member-uid&gt;10000000-0000-0000-0000-000000000009&lt;/member-uid&gt;

-        &lt;/record&gt;

-        &lt;record type=&quot;group&quot;&gt;

-            &lt;short-name&gt;group04&lt;/short-name&gt;

-            &lt;uid&gt;20000000-0000-0000-0000-000000000004&lt;/uid&gt;

-            &lt;guid&gt;20000000-0000-0000-0000-000000000004&lt;/guid&gt;

-            &lt;full-name&gt;Group 04&lt;/full-name&gt;

-            &lt;member-uid&gt;20000000-0000-0000-0000-000000000002&lt;/member-uid&gt;

-            &lt;member-uid&gt;20000000-0000-0000-0000-000000000003&lt;/member-uid&gt;

-            &lt;member-uid&gt;10000000-0000-0000-0000-000000000010&lt;/member-uid&gt;

-        &lt;/record&gt;

-&lt;/directory&gt;

</del></span></pre></div>

<a id="CalendarServerbranchesusersgayagroupsharee2txdavwhotesttest_group_attendeespy"></a>

<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/test_group_attendees.py (13758 => 13759)</h4>

<pre class="diff"><span>

<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/test_group_attendees.py        2014-07-16 00:07:13 UTC (rev 13758)

+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/test_group_attendees.py        2014-07-16 00:13:57 UTC (rev 13759)

</span><span class="lines">@@ -47,8 +47,7 @@

</span><span class="cx">             os.path.join(os.path.dirname(__file__), &quot;accounts&quot;)

</span><span class="cx">         )

</span><span class="cx">         yield self.buildStoreAndDirectory(

</span><del>-            accounts=accountsFilePath.child(&quot;groupAttendeeAccounts.xml&quot;),

-            resources=accountsFilePath.child(&quot;resources.xml&quot;),

</del><ins>+            accounts=accountsFilePath.child(&quot;groupAccounts.xml&quot;),

</ins><span class="cx">         )

</span><span class="cx">         yield self.populate()

</span><span class="cx"> 

</span><span class="lines">@@ -67,13 +66,13 @@

</span><span class="cx">         yield populateCalendarsFrom(self.requirements, self.storeUnderTest())

</span><span class="cx"> 

</span><span class="cx">     requirements = {

</span><del>-        &quot;10000000-0000-0000-0000-000000000001&quot; : None,

-        &quot;10000000-0000-0000-0000-000000000002&quot; : None,

-        &quot;10000000-0000-0000-0000-000000000006&quot; : None,

-        &quot;10000000-0000-0000-0000-000000000007&quot; : None,

-        &quot;10000000-0000-0000-0000-000000000008&quot; : None,

-        &quot;10000000-0000-0000-0000-000000000009&quot; : None,

-        &quot;10000000-0000-0000-0000-000000000010&quot; : None,

</del><ins>+        &quot;user01&quot; : None,

+        &quot;user02&quot; : None,

+        &quot;user06&quot; : None,

+        &quot;user07&quot; : None,

+        &quot;user08&quot; : None,

+        &quot;user09&quot; : None,

+        &quot;user10&quot; : None,

</ins><span class="cx"> 

</span><span class="cx">     }

</span><span class="cx"> 

</span><span class="lines">@@ -112,7 +111,7 @@

</span><span class="cx">         &quot;&quot;&quot;

</span><span class="cx">         Test that group attendee is expanded on PUT

</span><span class="cx">         &quot;&quot;&quot;

</span><del>-        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx"> 

</span><span class="cx">         data_put_1 = &quot;&quot;&quot;BEGIN:VCALENDAR

</span><span class="cx"> CALSCALE:GREGORIAN

</span><span class="lines">@@ -139,31 +138,31 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20140101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-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=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006

-ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007

-ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008

</del><ins>+ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:user01

+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:group02

+ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:group02&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06

+ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:group02&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07

+ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:group02&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:user01

</ins><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="cx"> END:VCALENDAR

</span><span class="cx"> &quot;&quot;&quot;

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000006&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000007&quot;, 0)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user06&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user07&quot;, 0)

</ins><span class="cx"> 

</span><span class="cx">         vcalendar = Component.fromString(data_put_1)

</span><span class="cx">         yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self._assertICalStrEqual(vcalendar, data_get_1)

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000006&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000007&quot;, 1)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user06&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user07&quot;, 1)

</ins><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx">     @inlineCallbacks

</span><span class="lines">@@ -171,7 +170,7 @@

</span><span class="cx">         &quot;&quot;&quot;

</span><span class="cx">         Test unknown group with CUTYPE=X-SERVER-GROUP handled

</span><span class="cx">         &quot;&quot;&quot;

</span><del>-        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx"> 

</span><span class="cx">         data_put_1 = &quot;&quot;&quot;BEGIN:VCALENDAR

</span><span class="cx"> CALSCALE:GREGORIAN

</span><span class="lines">@@ -198,10 +197,10 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20140101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:user01

</ins><span class="cx"> ATTENDEE;CUTYPE=X-SERVER-GROUP;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:uuid:FFFFFFFF-EEEE-DDDD-CCCC-BBBBBBBBBBBB

</span><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:user01

</ins><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="cx"> END:VCALENDAR

</span><span class="lines">@@ -211,7 +210,7 @@

</span><span class="cx">         yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))

</span><span class="cx"> 

</span><span class="lines">@@ -221,7 +220,7 @@

</span><span class="cx">         &quot;&quot;&quot;

</span><span class="cx">         Test that primary attendee also in group remains primary

</span><span class="cx">         &quot;&quot;&quot;

</span><del>-        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx"> 

</span><span class="cx">         data_put_1 = &quot;&quot;&quot;BEGIN:VCALENDAR

</span><span class="cx"> CALSCALE:GREGORIAN

</span><span class="lines">@@ -249,11 +248,11 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20140101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001

-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:user01

+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:user01

</ins><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="cx"> END:VCALENDAR

</span><span class="lines">@@ -262,7 +261,7 @@

</span><span class="cx">         yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))

</span><span class="cx"> 

</span><span class="lines">@@ -272,13 +271,13 @@

</span><span class="cx">         &quot;&quot;&quot;

</span><span class="cx">         Test that nested groups are expanded expanded on PUT

</span><span class="cx">         &quot;&quot;&quot;

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000006&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000007&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000008&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000009&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000010&quot;, 0)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user06&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user07&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user08&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user09&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user10&quot;, 0)

</ins><span class="cx"> 

</span><del>-        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx"> 

</span><span class="cx">         data_put_1 = &quot;&quot;&quot;BEGIN:VCALENDAR

</span><span class="cx"> CALSCALE:GREGORIAN

</span><span class="lines">@@ -293,7 +292,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:urn:x-uid:20000000-0000-0000-0000-000000000004

</del><ins>+ATTENDEE:urn:x-uid:group04

</ins><span class="cx"> END:VEVENT

</span><span class="cx"> END:VCALENDAR&quot;&quot;&quot;

</span><span class="cx"> 

</span><span class="lines">@@ -305,15 +304,15 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20140101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001

-ATTENDEE;CN=Group 04;CUTYPE=X-SERVER-GROUP;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000004

-ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000004&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006

-ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000004&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007

-ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000004&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008

-ATTENDEE;CN=User 09;EMAIL=user09@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000004&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009

-ATTENDEE;CN=User 10;EMAIL=user10@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000004&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000010

</del><ins>+ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:user01

+ATTENDEE;CN=Group 04;CUTYPE=X-SERVER-GROUP;RSVP=TRUE:urn:x-uid:group04

+ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:group04&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06

+ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:group04&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07

+ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:group04&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08

+ATTENDEE;CN=User 09;EMAIL=user09@example.com;MEMBER=&quot;urn:x-uid:group04&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user09

+ATTENDEE;CN=User 10;EMAIL=user10@example.com;MEMBER=&quot;urn:x-uid:group04&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user10

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:user01

</ins><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="cx"> END:VCALENDAR

</span><span class="lines">@@ -323,15 +322,15 @@

</span><span class="cx">         yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self._assertICalStrEqual(vcalendar, data_get_1)

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000006&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000007&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000008&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000009&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000010&quot;, 1)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user06&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user07&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user08&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user09&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user10&quot;, 1)

</ins><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx">     @inlineCallbacks

</span><span class="lines">@@ -339,12 +338,12 @@

</span><span class="cx">         &quot;&quot;&quot;

</span><span class="cx">         Test that expanded users in two primary groups have groups in MEMBERS param

</span><span class="cx">         &quot;&quot;&quot;

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000006&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000007&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000008&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000009&quot;, 0)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user06&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user07&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user08&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user09&quot;, 0)

</ins><span class="cx"> 

</span><del>-        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx"> 

</span><span class="cx">         data_put_1 = &quot;&quot;&quot;BEGIN:VCALENDAR

</span><span class="cx"> CALSCALE:GREGORIAN

</span><span class="lines">@@ -373,16 +372,16 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20140101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001

-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

-ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006

-ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;,&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007

-ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;,&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008

-ATTENDEE;CN=User 09;EMAIL=user09@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009

</del><ins>+ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:user01

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:group02

+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03@example.com;RSVP=TRUE:urn:x-uid:group03

+ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:group02&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06

+ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:group02&quot;,&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07

+ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:group02&quot;,&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08

+ATTENDEE;CN=User 09;EMAIL=user09@example.com;MEMBER=&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user09

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:user01

</ins><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="cx"> END:VCALENDAR&quot;&quot;&quot;

</span><span class="lines">@@ -391,14 +390,14 @@

</span><span class="cx">         yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self._assertICalStrEqual(vcalendar, data_get_1)

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000006&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000007&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000008&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000009&quot;, 1)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user06&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user07&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user08&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user09&quot;, 1)

</ins><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx">     @inlineCallbacks

</span><span class="lines">@@ -432,10 +431,10 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20240101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="cx"> END:VCALENDAR

</span><span class="lines">@@ -449,11 +448,11 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20240101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

-ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000001&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

+ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:group01&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> SEQUENCE:1

</span><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="lines">@@ -468,10 +467,10 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20240101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> SEQUENCE:2

</span><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="lines">@@ -490,50 +489,50 @@

</span><span class="cx">         groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())

</span><span class="cx">         self.assertEqual(len(groupsToRefresh), 0)

</span><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><span class="cx">         self.assertEqual(len(wps), 0)

</span><span class="cx"> 

</span><del>-        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = Component.fromString(data_put_1)

</span><span class="cx">         yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_2))

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000001&quot;, 0)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user01&quot;, 0)

</ins><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><span class="cx">         self.patch(CalendarDirectoryRecordMixin, &quot;expandedMembers&quot;, unpatchedExpandedMembers)

</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>-        self.assertEqual(list(groupsToRefresh)[0], &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        self.assertEqual(list(groupsToRefresh)[0], &quot;group01&quot;)

</ins><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><span class="cx">         yield self.commit()

</span><span class="cx">         self.assertEqual(len(wps), 1)

</span><span class="cx">         yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_3))

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000001&quot;, 1)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user01&quot;, 1)

</ins><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><span class="cx">         self.patch(CalendarDirectoryRecordMixin, &quot;expandedMembers&quot;, expandedMembers)

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><span class="cx">         yield self.commit()

</span><span class="cx">         self.assertEqual(len(wps), 1)

</span><span class="cx">         yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_4))

</span><span class="cx"> 

</span><del>-        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         cobjs = yield cal.objectResources()

</span><span class="cx">         self.assertEqual(len(cobjs), 1)

</span><span class="cx">         comp = yield cobjs[0].componentForUser()

</span><span class="lines">@@ -571,10 +570,10 @@

</span><span class="cx"> UID:event{0}@ninevah.local

</span><span class="cx"> DTSTART:20240101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-00000000000{0}

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:user0{0}

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:10000000-0000-0000-0000-00000000000{0}

</del><ins>+ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:user0{0}

</ins><span class="cx"> SUMMARY:event {0}

</span><span class="cx"> END:VEVENT

</span><span class="cx"> END:VCALENDAR

</span><span class="lines">@@ -588,11 +587,11 @@

</span><span class="cx"> UID:event{0}@ninevah.local

</span><span class="cx"> DTSTART:20240101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-00000000000{0}

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

-ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000001&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:user0{0}

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

+ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:group01&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:10000000-0000-0000-0000-00000000000{0}

</del><ins>+ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:user0{0}

</ins><span class="cx"> SEQUENCE:1

</span><span class="cx"> SUMMARY:event {0}

</span><span class="cx"> END:VEVENT

</span><span class="lines">@@ -607,10 +606,10 @@

</span><span class="cx"> UID:event{0}@ninevah.local

</span><span class="cx"> DTSTART:20240101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-00000000000{0}

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:user0{0}

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:10000000-0000-0000-0000-00000000000{0}

</del><ins>+ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:user0{0}

</ins><span class="cx"> SEQUENCE:2

</span><span class="cx"> SUMMARY:event {0}

</span><span class="cx"> END:VEVENT

</span><span class="lines">@@ -629,55 +628,55 @@

</span><span class="cx">         groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())

</span><span class="cx">         self.assertEqual(len(groupsToRefresh), 0)

</span><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><span class="cx">         self.assertEqual(len(wps), 0)

</span><span class="cx"> 

</span><span class="cx">         userRange = range(6, 10) # have to be 1 diget and homes in requirements

</span><span class="cx"> 

</span><span class="cx">         for i in userRange:

</span><del>-            calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-00000000000{0}&quot;.format(i))

</del><ins>+            calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user0{0}&quot;.format(i))

</ins><span class="cx">             vcalendar = Component.fromString(data_put_1.format(i))

</span><span class="cx">             yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">             yield self.commit()

</span><span class="cx"> 

</span><del>-            cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-00000000000{0}&quot;.format(i))

</del><ins>+            cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user0{0}&quot;.format(i))

</ins><span class="cx">             vcalendar = yield cobj.component()

</span><span class="cx">             self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_2.format(i)))

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000001&quot;, 0)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user01&quot;, 0)

</ins><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><span class="cx">         self.patch(CalendarDirectoryRecordMixin, &quot;expandedMembers&quot;, unpatchedExpandedMembers)

</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>-        self.assertEqual(list(groupsToRefresh)[0], &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        self.assertEqual(list(groupsToRefresh)[0], &quot;group01&quot;)

</ins><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><span class="cx">         yield self.commit()

</span><span class="cx">         self.assertEqual(len(wps), len(userRange))

</span><span class="cx">         yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)

</span><span class="cx"> 

</span><span class="cx">         for i in userRange:

</span><del>-            cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-00000000000{0}&quot;.format(i))

</del><ins>+            cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user0{0}&quot;.format(i))

</ins><span class="cx">             vcalendar = yield cobj.component()

</span><span class="cx">             self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_3.format(i)))

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000001&quot;, len(userRange))

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user01&quot;, len(userRange))

</ins><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><span class="cx">         self.patch(CalendarDirectoryRecordMixin, &quot;expandedMembers&quot;, expandedMembers)

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><span class="cx">         yield self.commit()

</span><span class="cx">         self.assertEqual(len(wps), len(userRange))

</span><span class="cx">         yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)

</span><span class="cx"> 

</span><span class="cx">         for i in userRange:

</span><del>-            cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-00000000000{0}&quot;.format(i))

</del><ins>+            cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user0{0}&quot;.format(i))

</ins><span class="cx">             vcalendar = yield cobj.component()

</span><span class="cx">             self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_4.format(i)))

</span><span class="cx"> 

</span><del>-        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         cobjs = yield cal.objectResources()

</span><span class="cx">         self.assertEqual(len(cobjs), len(userRange))

</span><span class="cx">         for cobj in cobjs:

</span><span class="lines">@@ -716,18 +715,18 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20140101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

-ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000001&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

+ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:group01&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="cx"> END:VCALENDAR

</span><span class="cx"> &quot;&quot;&quot;

</span><span class="cx">         groupCacher = GroupCacher(self.transactionUnderTest().directoryService())

</span><span class="cx"> 

</span><del>-        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = Component.fromString(data_put_1)

</span><span class="cx">         yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">         yield self.commit()

</span><span class="lines">@@ -735,13 +734,13 @@

</span><span class="cx">         groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())

</span><span class="cx">         self.assertEqual(len(groupsToRefresh), 0)

</span><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><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="cx">             yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)

</span><span class="cx">         self.assertEqual(len(wps), 0)

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))

</span><span class="cx"> 

</span><span class="lines">@@ -794,11 +793,11 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20240101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

-ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000001&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

+ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:group01&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="cx"> END:VCALENDAR

</span><span class="lines">@@ -812,10 +811,10 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20140101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> SEQUENCE:1

</span><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="lines">@@ -830,24 +829,24 @@

</span><span class="cx">         unpatchedExpandedMembers = CalendarDirectoryRecordMixin.expandedMembers

</span><span class="cx">         groupCacher = GroupCacher(self.transactionUnderTest().directoryService())

</span><span class="cx"> 

</span><del>-        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = Component.fromString(data_put_1)

</span><span class="cx">         yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">         yield self.commit()

</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>-        self.assertEqual(list(groupsToRefresh)[0], &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        self.assertEqual(list(groupsToRefresh)[0], &quot;group01&quot;)

</ins><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><span class="cx">         yield self.commit()

</span><span class="cx">         self.assertEqual(len(wps), 0)

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000001&quot;, 1)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user01&quot;, 1)

</ins><span class="cx"> 

</span><span class="cx">         vcalendar = Component.fromString(data_put_2)

</span><span class="cx">         yield cobj.setComponent(vcalendar)

</span><span class="lines">@@ -855,11 +854,11 @@

</span><span class="cx"> 

</span><span class="cx">         self.patch(CalendarDirectoryRecordMixin, &quot;expandedMembers&quot;, expandedMembers)

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_2))

</span><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><span class="cx">         self.assertEqual(len(wps), 0)

</span><span class="cx">         yield self.commit()

</span><span class="cx">         yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)

</span><span class="lines">@@ -870,7 +869,7 @@

</span><span class="cx">         (

</span><span class="cx">             groupID, _ignore_name, _ignore_membershipHash, _ignore_modDate,

</span><span class="cx">             _ignore_extant

</span><del>-        ) = yield self.transactionUnderTest().groupByUID(&quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        ) = yield self.transactionUnderTest().groupByUID(&quot;group01&quot;)

</ins><span class="cx">         ga = schema.GROUP_ATTENDEE

</span><span class="cx">         yield Insert({

</span><span class="cx">                 ga.RESOURCE_ID: cobj._resourceID,

</span><span class="lines">@@ -878,17 +877,17 @@

</span><span class="cx">                 ga.MEMBERSHIP_HASH: (-1),

</span><span class="cx">             }

</span><span class="cx">         ).on(self.transactionUnderTest())

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><span class="cx">         self.assertEqual(len(wps), 1)

</span><span class="cx">         yield self.commit()

</span><span class="cx">         yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_2))

</span><span class="cx"> 

</span><span class="cx">         '''

</span><del>-        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         cobjs = yield cal.objectResources()

</span><span class="cx">         for cobj in cobjs:

</span><span class="cx">             print(&quot;comp = %s&quot; % ((yield cobj.componentForUser())))

</span><span class="lines">@@ -954,11 +953,11 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20120101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

-ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000001&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

+ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:group01&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> RRULE:FREQ=DAILY;UNTIL=20240101T100000

</span><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="lines">@@ -973,10 +972,10 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20120101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> RRULE:FREQ=DAILY;UNTIL=20140101T100000

</span><span class="cx"> SEQUENCE:1

</span><span class="cx"> SUMMARY:event 1

</span><span class="lines">@@ -992,24 +991,24 @@

</span><span class="cx">         unpatchedExpandedMembers = CalendarDirectoryRecordMixin.expandedMembers

</span><span class="cx">         groupCacher = GroupCacher(self.transactionUnderTest().directoryService())

</span><span class="cx"> 

</span><del>-        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = Component.fromString(data_put_1)

</span><span class="cx">         yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">         yield self.commit()

</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>-        self.assertEqual(list(groupsToRefresh)[0], &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        self.assertEqual(list(groupsToRefresh)[0], &quot;group01&quot;)

</ins><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><span class="cx">         yield self.commit()

</span><span class="cx">         self.assertEqual(len(wps), 0)

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000001&quot;, 1)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user01&quot;, 1)

</ins><span class="cx"> 

</span><span class="cx">         vcalendar = Component.fromString(data_put_2)

</span><span class="cx">         yield cobj.setComponent(vcalendar)

</span><span class="lines">@@ -1017,11 +1016,11 @@

</span><span class="cx"> 

</span><span class="cx">         self.patch(CalendarDirectoryRecordMixin, &quot;expandedMembers&quot;, expandedMembers)

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_2))

</span><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><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="cx">             yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)

</span><span class="lines">@@ -1033,7 +1032,7 @@

</span><span class="cx">         (

</span><span class="cx">             groupID, _ignore_name, _ignore_membershipHash, _ignore_modDate,

</span><span class="cx">             _ignore_extant

</span><del>-        ) = yield self.transactionUnderTest().groupByUID(&quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        ) = yield self.transactionUnderTest().groupByUID(&quot;group01&quot;)

</ins><span class="cx">         ga = schema.GROUP_ATTENDEE

</span><span class="cx">         yield Insert({

</span><span class="cx">                 ga.RESOURCE_ID: cobj._resourceID,

</span><span class="lines">@@ -1041,12 +1040,12 @@

</span><span class="cx">                 ga.MEMBERSHIP_HASH: (-1),

</span><span class="cx">             }

</span><span class="cx">         ).on(self.transactionUnderTest())

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><span class="cx">         self.assertEqual(len(wps), 1)

</span><span class="cx">         yield self.commit()

</span><span class="cx">         yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_2))

</span><span class="cx"> 

</span><span class="lines">@@ -1083,11 +1082,11 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20120101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

-ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000001&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

+ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:group01&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> RRULE:FREQ=DAILY;UNTIL=20240101T100000

</span><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="lines">@@ -1101,10 +1100,10 @@

</span><span class="cx"> BEGIN:VEVENT

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> {start}DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> {relatedTo}RRULE:FREQ=DAILY;UNTIL=20240101T100000

</span><span class="cx"> SEQUENCE:2

</span><span class="cx"> SUMMARY:event 1

</span><span class="lines">@@ -1118,11 +1117,11 @@

</span><span class="cx"> BEGIN:VEVENT

</span><span class="cx"> {uid}DTSTART:20120101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

-ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000001&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

+ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:group01&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> {relatedTo}{rule}SEQUENCE:1

</span><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="lines">@@ -1136,25 +1135,25 @@

</span><span class="cx"> 

</span><span class="cx">         groupCacher = GroupCacher(self.transactionUnderTest().directoryService())

</span><span class="cx"> 

</span><del>-        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = Component.fromString(data_put_1)

</span><span class="cx">         yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000001&quot;, 1)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user01&quot;, 1)

</ins><span class="cx"> 

</span><span class="cx">         self.patch(CalendarDirectoryRecordMixin, &quot;expandedMembers&quot;, expandedMembers)

</span><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><span class="cx">         yield self.commit()

</span><span class="cx">         self.assertEqual(len(wps), 1)

</span><span class="cx">         yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)

</span><span class="cx"> 

</span><del>-        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         cobjs = yield cal.objectResources()

</span><span class="cx">         for cobj in cobjs:

</span><span class="cx">             vcalendar = yield cobj.component()

</span><span class="lines">@@ -1191,7 +1190,7 @@

</span><span class="cx"> 

</span><span class="cx">         #TODO: add some meaningful test

</span><span class="cx">         '''

</span><del>-        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         cobjs = yield cal.objectResources()

</span><span class="cx">         for cobj in cobjs:

</span><span class="cx">             vcalendar = yield cobj.component()

</span><span class="lines">@@ -1230,10 +1229,10 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20120101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> RRULE:FREQ=DAILY;UNTIL=20240101T100000

</span><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="lines">@@ -1247,11 +1246,11 @@

</span><span class="cx"> BEGIN:VEVENT

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> {start}DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

-ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000001&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

+ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER=&quot;urn:x-uid:group01&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> {relatedTo}RRULE:FREQ=DAILY;UNTIL=20240101T100000

</span><span class="cx"> SEQUENCE:2

</span><span class="cx"> SUMMARY:event 1

</span><span class="lines">@@ -1265,10 +1264,10 @@

</span><span class="cx"> BEGIN:VEVENT

</span><span class="cx"> {uid}DTSTART:20120101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002

-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001

</del><ins>+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002

</del><ins>+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02

</ins><span class="cx"> {relatedTo}{rule}SEQUENCE:1

</span><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="lines">@@ -1285,25 +1284,25 @@

</span><span class="cx"> 

</span><span class="cx">         groupCacher = GroupCacher(self.transactionUnderTest().directoryService())

</span><span class="cx"> 

</span><del>-        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = Component.fromString(data_put_1)

</span><span class="cx">         yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000001&quot;, 0)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user01&quot;, 0)

</ins><span class="cx"> 

</span><span class="cx">         self.patch(CalendarDirectoryRecordMixin, &quot;expandedMembers&quot;, unpatchedExpandedMembers)

</span><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group01&quot;)

</ins><span class="cx">         yield self.commit()

</span><span class="cx">         self.assertEqual(len(wps), 1)

</span><span class="cx">         yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)

</span><span class="cx"> 

</span><del>-        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user02&quot;)

</ins><span class="cx">         cobjs = yield cal.objectResources()

</span><span class="cx">         for cobj in cobjs:

</span><span class="cx">             vcalendar = yield cobj.component()

</span><span class="lines">@@ -1338,10 +1337,10 @@

</span><span class="cx">                     )

</span><span class="cx">                 )

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000001&quot;, 1)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user01&quot;, 1)

</ins><span class="cx">         #TODO: add some meaningful test

</span><span class="cx">         '''

</span><del>-        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         cobjs = yield cal.objectResources()

</span><span class="cx">         for cobj in cobjs:

</span><span class="cx">             vcalendar = yield cobj.component()

</span><span class="lines">@@ -1356,13 +1355,13 @@

</span><span class="cx">         of those groups is removed

</span><span class="cx">         &quot;&quot;&quot;

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000006&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000007&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000008&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000009&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000010&quot;, 0)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user06&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user07&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user08&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user09&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user10&quot;, 0)

</ins><span class="cx"> 

</span><del>-        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx"> 

</span><span class="cx">         data_put_1 = &quot;&quot;&quot;BEGIN:VCALENDAR

</span><span class="cx"> CALSCALE:GREGORIAN

</span><span class="lines">@@ -1391,16 +1390,16 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20240101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001

-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

-ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006

-ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;,&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007

-ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;,&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008

-ATTENDEE;CN=User 09;EMAIL=user09@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009

</del><ins>+ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:user01

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:group02

+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03@example.com;RSVP=TRUE:urn:x-uid:group03

+ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:group02&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06

+ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:group02&quot;,&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07

+ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:group02&quot;,&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08

+ATTENDEE;CN=User 09;EMAIL=user09@example.com;MEMBER=&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user09

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:user01

</ins><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="cx"> END:VCALENDAR&quot;&quot;&quot;

</span><span class="lines">@@ -1413,15 +1412,15 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20240101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001

-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

-ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007

-ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008

-ATTENDEE;CN=User 09;EMAIL=user09@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009

</del><ins>+ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:user01

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:group02

+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03@example.com;RSVP=TRUE:urn:x-uid:group03

+ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07

+ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08

+ATTENDEE;CN=User 09;EMAIL=user09@example.com;MEMBER=&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user09

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:user01

</ins><span class="cx"> SEQUENCE:1

</span><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="lines">@@ -1436,16 +1435,16 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20240101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001

-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

-ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006

-ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;,&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007

-ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;,&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008

-ATTENDEE;CN=User 09;EMAIL=user09@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009

</del><ins>+ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:user01

+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com;RSVP=TRUE:urn:x-uid:group01

+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:group02

+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03@example.com;RSVP=TRUE:urn:x-uid:group03

+ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:group02&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06

+ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:group02&quot;,&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07

+ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:group02&quot;,&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08

+ATTENDEE;CN=User 09;EMAIL=user09@example.com;MEMBER=&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user09

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:user01

</ins><span class="cx"> SEQUENCE:2

</span><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="lines">@@ -1456,7 +1455,7 @@

</span><span class="cx">         @inlineCallbacks

</span><span class="cx">         def recordWithUID(self, uid):

</span><span class="cx"> 

</span><del>-            if uid == &quot;20000000-0000-0000-0000-000000000002&quot;:

</del><ins>+            if uid == &quot;group02&quot;:

</ins><span class="cx">                 result = None

</span><span class="cx">             else:

</span><span class="cx">                 result = yield unpatchedRecordWithUID(self, uid)

</span><span class="lines">@@ -1466,41 +1465,41 @@

</span><span class="cx">         yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self._assertICalStrEqual(vcalendar, data_get_1)

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000006&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000007&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000008&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000009&quot;, 1)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user06&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user07&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user08&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user09&quot;, 1)

</ins><span class="cx"> 

</span><span class="cx">         # cache group

</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><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group02&quot;)

</ins><span class="cx">         yield self.commit()

</span><span class="cx">         self.assertEqual(len(wps), 0)

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self._assertICalStrEqual(vcalendar, data_get_1)

</span><span class="cx"> 

</span><span class="cx">         # remove group members run cacher again

</span><span class="cx">         self.patch(DirectoryService, &quot;recordWithUID&quot;, recordWithUID)

</span><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group02&quot;)

</ins><span class="cx">         yield self.commit()

</span><span class="cx">         self.assertEqual(len(wps), 1)

</span><span class="cx">         yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self._assertICalStrEqual(vcalendar, data_get_2)

</span><span class="cx"> 

</span><del>-        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000006&quot;)

</del><ins>+        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user06&quot;)

</ins><span class="cx">         cobjs = yield cal.objectResources()

</span><span class="cx">         self.assertEqual(len(cobjs), 1)

</span><span class="cx">         comp = yield cobjs[0].componentForUser()

</span><span class="lines">@@ -1510,16 +1509,16 @@

</span><span class="cx">         # add group members back, run cacher

</span><span class="cx">         self.patch(DirectoryService, &quot;recordWithUID&quot;, unpatchedRecordWithUID)

</span><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group02&quot;)

</ins><span class="cx">         self.assertEqual(len(wps), 1)

</span><span class="cx">         yield self.commit()

</span><span class="cx">         yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self._assertICalStrEqual(vcalendar, data_get_3)

</span><span class="cx"> 

</span><del>-        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000006&quot;)

</del><ins>+        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user06&quot;)

</ins><span class="cx">         cobjs = yield cal.objectResources()

</span><span class="cx">         self.assertEqual(len(cobjs), 1)

</span><span class="cx">         comp = yield cobjs[0].componentForUser()

</span><span class="lines">@@ -1535,13 +1534,13 @@

</span><span class="cx">         those groups is removed

</span><span class="cx">         &quot;&quot;&quot;

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000006&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000007&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000008&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000009&quot;, 0)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000010&quot;, 0)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user06&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user07&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user08&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user09&quot;, 0)

+        yield self._verifyObjectResourceCount(&quot;user10&quot;, 0)

</ins><span class="cx"> 

</span><del>-        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        calendar = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx"> 

</span><span class="cx">         data_put_1 = &quot;&quot;&quot;BEGIN:VCALENDAR

</span><span class="cx"> CALSCALE:GREGORIAN

</span><span class="lines">@@ -1569,15 +1568,15 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20240101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-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

-ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006

-ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;,&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007

-ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;,&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008

-ATTENDEE;CN=User 09;EMAIL=user09@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000003&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009

</del><ins>+ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:user01

+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:group02

+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03@example.com;RSVP=TRUE:urn:x-uid:group03

+ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:group02&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06

+ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:group02&quot;,&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07

+ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:group02&quot;,&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08

+ATTENDEE;CN=User 09;EMAIL=user09@example.com;MEMBER=&quot;urn:x-uid:group03&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user09

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:user01

</ins><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="cx"> END:VCALENDAR&quot;&quot;&quot;

</span><span class="lines">@@ -1607,13 +1606,13 @@

</span><span class="cx"> UID:event1@ninevah.local

</span><span class="cx"> DTSTART:20240101T100000Z

</span><span class="cx"> DURATION:PT1H

</span><del>-ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:10000000-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=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006

-ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007

-ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:20000000-0000-0000-0000-000000000002&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008

</del><ins>+ATTENDEE;CN=User 01;EMAIL=user01@example.com;RSVP=TRUE:urn:x-uid:user01

+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02@example.com;RSVP=TRUE:urn:x-uid:group02

+ATTENDEE;CN=User 06;EMAIL=user06@example.com;MEMBER=&quot;urn:x-uid:group02&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06

+ATTENDEE;CN=User 07;EMAIL=user07@example.com;MEMBER=&quot;urn:x-uid:group02&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07

+ATTENDEE;CN=User 08;EMAIL=user08@example.com;MEMBER=&quot;urn:x-uid:group02&quot;;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08

</ins><span class="cx"> CREATED:20060101T150000Z

</span><del>-ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:10000000-0000-0000-0000-000000000001

</del><ins>+ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:user01

</ins><span class="cx"> SEQUENCE:1

</span><span class="cx"> SUMMARY:event 1

</span><span class="cx"> END:VEVENT

</span><span class="lines">@@ -1624,28 +1623,28 @@

</span><span class="cx">         yield calendar.createCalendarObjectWithName(&quot;data1.ics&quot;, vcalendar)

</span><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self._assertICalStrEqual(vcalendar, data_get_1)

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000006&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000007&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000008&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000009&quot;, 1)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user06&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user07&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user08&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user09&quot;, 1)

</ins><span class="cx"> 

</span><span class="cx">         # cache groups

</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><span class="cx"> 

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group02&quot;)

</ins><span class="cx">         yield self.commit()

</span><span class="cx">         self.assertEqual(len(wps), 0)

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000003&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group03&quot;)

</ins><span class="cx">         yield self.commit()

</span><span class="cx">         self.assertEqual(len(wps), 0)

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self._assertICalStrEqual(vcalendar, data_get_1)

</span><span class="cx"> 

</span><span class="lines">@@ -1653,22 +1652,22 @@

</span><span class="cx">         yield cobj.setComponent(vcalendar)

</span><span class="cx">         yield self.commit()

</span><span class="cx"> 

</span><del>-        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000001&quot;)

</del><ins>+        cobj = yield self.calendarObjectUnderTest(name=&quot;data1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)

</ins><span class="cx">         vcalendar = yield cobj.component()

</span><span class="cx">         self._assertICalStrEqual(vcalendar, data_get_2)

</span><span class="cx"> 

</span><del>-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000006&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000007&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000008&quot;, 1)

-        yield self._verifyObjectResourceCount(&quot;10000000-0000-0000-0000-000000000009&quot;, 1)

</del><ins>+        yield self._verifyObjectResourceCount(&quot;user06&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user07&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user08&quot;, 1)

+        yield self._verifyObjectResourceCount(&quot;user09&quot;, 1)

</ins><span class="cx"> 

</span><span class="cx">         # groups did not change so no work proposals

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000002&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group02&quot;)

</ins><span class="cx">         self.assertEqual(len(wps), 0)

</span><del>-        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;20000000-0000-0000-0000-000000000003&quot;)

</del><ins>+        wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), &quot;group03&quot;)

</ins><span class="cx">         self.assertEqual(len(wps), 0)

</span><span class="cx"> 

</span><del>-        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;10000000-0000-0000-0000-000000000009&quot;)

</del><ins>+        cal = yield self.calendarUnderTest(name=&quot;calendar&quot;, home=&quot;user09&quot;)

</ins><span class="cx">         cobjs = yield cal.objectResources()

</span><span class="cx">         self.assertEqual(len(cobjs), 1)

</span><span class="cx">         comp = yield cobjs[0].componentForUser()

</span></span></pre>

</div>

</div>


</body>

</html>