<!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>[13010] CalendarServer/branches/users/sagen/move2who-4</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/13010">13010</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-27 10:56:23 -0700 (Thu, 27 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove redundant expandedMembers( ) implementation.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestaccountsxml">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhodirectorypy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhogroupspy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/groups.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhotesttest_groupspy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_groups.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestaccountsxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml (13009 => 13010)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml        2014-03-27 03:38:48 UTC (rev 13009)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml        2014-03-27 17:56:23 UTC (rev 13010)
</span><span class="lines">@@ -189,7 +189,70 @@
</span><span class="cx">     &lt;email&gt;user06@example.com&lt;/email&gt;
</span><span class="cx">   &lt;/record&gt;
</span><span class="cx"> 
</span><ins>+  &lt;record type=&quot;user&quot;&gt;
+    &lt;uid&gt;__wsanchez1__&lt;/uid&gt;
+    &lt;short-name&gt;wsanchez1&lt;/short-name&gt;
+    &lt;short-name&gt;wilfredo_sanchez&lt;/short-name&gt;
+    &lt;full-name&gt;Wilfredo Sanchez&lt;/full-name&gt;
+    &lt;password&gt;zehcnasw&lt;/password&gt;
+    &lt;email&gt;wsanchez@bitbucket.calendarserver.org&lt;/email&gt;
+    &lt;email&gt;wsanchez@devnull.twistedmatrix.com&lt;/email&gt;
+  &lt;/record&gt;
</ins><span class="cx"> 
</span><ins>+  &lt;record type=&quot;user&quot;&gt;
+    &lt;uid&gt;__glyph1__&lt;/uid&gt;
+    &lt;short-name&gt;glyph1&lt;/short-name&gt;
+    &lt;full-name&gt;Glyph Lefkowitz&lt;/full-name&gt;
+    &lt;password&gt;hpylg&lt;/password&gt;
+    &lt;email&gt;glyph@bitbucket.calendarserver.org&lt;/email&gt;
+    &lt;email&gt;glyph@devnull.twistedmatrix.com&lt;/email&gt;
+  &lt;/record&gt;
+
+  &lt;record type=&quot;user&quot;&gt;
+    &lt;uid&gt;__sagen1__&lt;/uid&gt;
+    &lt;short-name&gt;sagen1&lt;/short-name&gt;
+    &lt;full-name&gt;Morgen Sagen&lt;/full-name&gt;
+    &lt;password&gt;negas&lt;/password&gt;
+    &lt;email&gt;sagen@bitbucket.calendarserver.org&lt;/email&gt;
+    &lt;email&gt;shared@example.com&lt;/email&gt;
+  &lt;/record&gt;
+
+  &lt;record type=&quot;user&quot;&gt;
+    &lt;uid&gt;__cdaboo1__&lt;/uid&gt;
+    &lt;short-name&gt;cdaboo1&lt;/short-name&gt;
+    &lt;full-name&gt;Cyrus Daboo&lt;/full-name&gt;
+    &lt;password&gt;suryc&lt;/password&gt;
+    &lt;email&gt;cdaboo@bitbucket.calendarserver.org&lt;/email&gt;
+  &lt;/record&gt;
+
+  &lt;record type=&quot;user&quot;&gt;
+    &lt;uid&gt;__dre1__&lt;/uid&gt;
+    &lt;short-name&gt;dre1&lt;/short-name&gt;
+    &lt;full-name&gt;Andre LaBranche&lt;/full-name&gt;
+    &lt;password&gt;erd&lt;/password&gt;
+    &lt;email&gt;dre@bitbucket.calendarserver.org&lt;/email&gt;
+    &lt;email&gt;shared@example.com&lt;/email&gt;
+  &lt;/record&gt;
+
+  &lt;record type=&quot;group&quot;&gt;
+    &lt;uid&gt;__top_group_1__&lt;/uid&gt;
+    &lt;short-name&gt;top-group-1&lt;/short-name&gt;
+    &lt;full-name&gt;Top Group 1&lt;/full-name&gt;
+    &lt;email&gt;topgroup1@example.com&lt;/email&gt;
+    &lt;member-uid&gt;__wsanchez1__&lt;/member-uid&gt;
+    &lt;member-uid&gt;__glyph1__&lt;/member-uid&gt;
+    &lt;member-uid&gt;__sub_group_1__&lt;/member-uid&gt;
+  &lt;/record&gt;
+
+  &lt;record type=&quot;group&quot;&gt;
+    &lt;uid&gt;__sub_group_1__&lt;/uid&gt;
+    &lt;short-name&gt;sub-group-1&lt;/short-name&gt;
+    &lt;full-name&gt;Sub Group 1&lt;/full-name&gt;
+    &lt;email&gt;subgroup1@example.com&lt;/email&gt;
+    &lt;member-uid&gt;__sagen1__&lt;/member-uid&gt;
+    &lt;member-uid&gt;__cdaboo1__&lt;/member-uid&gt;
+  &lt;/record&gt;
+
</ins><span class="cx">   &lt;!-- Repeat is not (yet?) supported in twext.who.xml
</span><span class="cx">   &lt;user repeat=&quot;100&quot;&gt;
</span><span class="cx">     &lt;short-name&gt;user%02d&lt;/short-name&gt;
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py (13009 => 13010)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py        2014-03-27 03:38:48 UTC (rev 13009)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py        2014-03-27 17:56:23 UTC (rev 13010)
</span><span class="lines">@@ -440,7 +440,6 @@
</span><span class="cx">             if member.recordType == BaseRecordType.user:
</span><span class="cx">                 if member not in members:
</span><span class="cx">                     members.add(member)
</span><del>-            elif member.recordType == BaseRecordType.group:
-                yield member.expandedMembers(members)
</del><ins>+            yield member.expandedMembers(members)
</ins><span class="cx"> 
</span><span class="cx">         returnValue(members)
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/groups.py (13009 => 13010)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/groups.py        2014-03-27 03:38:48 UTC (rev 13009)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/groups.py        2014-03-27 17:56:23 UTC (rev 13010)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx"> from twext.enterprise.dal.record import fromTable
</span><span class="cx"> from twext.enterprise.dal.syntax import Delete, Select
</span><span class="cx"> from twext.enterprise.jobqueue import WorkItem, PeerConnectionPool
</span><del>-from twext.who.idirectory import RecordType
</del><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from txdav.common.datastore.sql_tables import schema
</span><span class="cx"> import datetime
</span><span class="lines">@@ -177,34 +176,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-@inlineCallbacks
-def expandedMembers(record, members=None, records=None):
-    &quot;&quot;&quot;
-    Return the expanded set of member records.  Intermediate groups are not
-    returned in the results, but their members are.
-    &quot;&quot;&quot;
-    if members is None:
-        members = set()
-    if records is None:
-        records = set()
</del><span class="cx"> 
</span><del>-    if record not in records:
-        records.add(record)
-        for member in (yield record.members()):
-            if member not in records:
-                #MOVE2WHO
-                #TODO:  HACK for old-style XML. FIX
-                if (
-                    member.recordType != RecordType.group and
-                    str(member.recordType) != &quot;groups&quot;
-                ):
-                    members.add(member)
-                yield expandedMembers(member, members, records)
-
-    returnValue(members)
-
-
-
</del><span class="cx"> def diffAssignments(old, new):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Compare two proxy assignment lists and return their differences in the form
</span><span class="lines">@@ -329,7 +301,7 @@
</span><span class="cx">         else:
</span><span class="cx">             self.log.debug(&quot;Got group record: {u}&quot;, u=record.uid)
</span><span class="cx">             membershipHashContent = hashlib.md5()
</span><del>-            members = (yield expandedMembers(record))
</del><ins>+            members = yield record.expandedMembers()
</ins><span class="cx">             members = list(members)
</span><span class="cx">             members.sort(cmp=lambda x, y: cmp(x.uid, y.uid))
</span><span class="cx">             for member in members:
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhotesttest_groupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_groups.py (13009 => 13010)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_groups.py        2014-03-27 03:38:48 UTC (rev 13009)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_groups.py        2014-03-27 17:56:23 UTC (rev 13010)
</span><span class="lines">@@ -18,9 +18,8 @@
</span><span class="cx"> Group membership caching implementation tests
</span><span class="cx"> &quot;&quot;&quot;
</span><span class="cx"> 
</span><del>-from txdav.who.groups import GroupCacher, expandedMembers, diffAssignments
</del><ins>+from txdav.who.groups import GroupCacher, diffAssignments
</ins><span class="cx"> from twext.who.idirectory import RecordType
</span><del>-from twext.who.test.test_xml import xmlService
</del><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twistedcaldav.test.util import StoreTestCase
</span><span class="cx"> from txdav.common.icommondatastore import NotFoundError
</span><span class="lines">@@ -31,33 +30,10 @@
</span><span class="cx">     @inlineCallbacks
</span><span class="cx">     def setUp(self):
</span><span class="cx">         yield super(GroupCacherTest, self).setUp()
</span><del>-        self.xmlService = xmlService(self.mktemp(), xmlData=testXMLConfig)
-        self.groupCacher = GroupCacher(self.xmlService)
</del><ins>+        self.groupCacher = GroupCacher(self.directory)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><del>-    def test_expandedMembers(self):
-        &quot;&quot;&quot;
-        Verify expandedMembers() returns a &quot;flattened&quot; set of records
-        belonging to a group (and does not return sub-groups themselves,
-        only their members)
-        &quot;&quot;&quot;
-        record = yield self.xmlService.recordWithUID(u&quot;__top_group_1__&quot;)
-        memberUIDs = set()
-        for member in (yield expandedMembers(record)):
-            memberUIDs.add(member.uid)
-        self.assertEquals(
-            memberUIDs,
-            set([&quot;__cdaboo__&quot;, &quot;__glyph__&quot;, &quot;__sagen__&quot;, &quot;__wsanchez__&quot;])
-        )
-
-        # Non group records return an empty set() of members
-        record = yield self.xmlService.recordWithUID(u&quot;__sagen__&quot;)
-        members = yield expandedMembers(record)
-        self.assertEquals(0, len(list(members)))
-
-
-    @inlineCallbacks
</del><span class="cx">     def test_refreshGroup(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Verify refreshGroup() adds a group to the Groups table with the
</span><span class="lines">@@ -67,33 +43,33 @@
</span><span class="cx">         store = self.storeUnderTest()
</span><span class="cx">         txn = store.newTransaction()
</span><span class="cx"> 
</span><del>-        record = yield self.xmlService.recordWithUID(u&quot;__top_group_1__&quot;)
</del><ins>+        record = yield self.directory.recordWithUID(u&quot;__top_group_1__&quot;)
</ins><span class="cx">         yield self.groupCacher.refreshGroup(txn, record.uid)
</span><span class="cx"> 
</span><span class="cx">         groupID, name, membershipHash = (yield txn.groupByUID(record.uid))
</span><span class="cx"> 
</span><del>-        self.assertEquals(membershipHash, &quot;f380860ff5e02c2433fbd4b5ed3e090c&quot;)
</del><ins>+        self.assertEquals(membershipHash, &quot;553eb54e3bbb26582198ee04541dbee4&quot;)
</ins><span class="cx"> 
</span><span class="cx">         groupUID, name, membershipHash = (yield txn.groupByID(groupID))
</span><span class="cx">         self.assertEquals(groupUID, record.uid)
</span><span class="cx">         self.assertEquals(name, u&quot;Top Group 1&quot;)
</span><del>-        self.assertEquals(membershipHash, &quot;f380860ff5e02c2433fbd4b5ed3e090c&quot;)
</del><ins>+        self.assertEquals(membershipHash, &quot;553eb54e3bbb26582198ee04541dbee4&quot;)
</ins><span class="cx"> 
</span><span class="cx">         members = (yield txn.membersOfGroup(groupID))
</span><span class="cx">         self.assertEquals(
</span><del>-            set([u'__cdaboo__', u'__glyph__', u'__sagen__', u'__wsanchez__']),
</del><ins>+            set([u'__cdaboo1__', u'__glyph1__', u'__sagen1__', u'__wsanchez1__']),
</ins><span class="cx">             members
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx">         records = (yield self.groupCacher.cachedMembers(txn, groupID))
</span><span class="cx">         self.assertEquals(
</span><span class="cx">             set([r.shortNames[0] for r in records]),
</span><del>-            set([&quot;wsanchez&quot;, &quot;cdaboo&quot;, &quot;glyph&quot;, &quot;sagen&quot;])
</del><ins>+            set([&quot;wsanchez1&quot;, &quot;cdaboo1&quot;, &quot;glyph1&quot;, &quot;sagen1&quot;])
</ins><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx">         # sagen is in the top group, even though it's actually one level
</span><span class="cx">         # removed
</span><del>-        record = yield self.xmlService.recordWithUID(u&quot;__sagen__&quot;)
</del><ins>+        record = yield self.directory.recordWithUID(u&quot;__sagen1__&quot;)
</ins><span class="cx">         groups = (yield self.groupCacher.cachedGroupsFor(txn, record.uid))
</span><span class="cx">         self.assertEquals(set([u&quot;__top_group_1__&quot;]), groups)
</span><span class="cx"> 
</span><span class="lines">@@ -116,9 +92,9 @@
</span><span class="cx"> 
</span><span class="cx">         # Remove two members, and add one member
</span><span class="cx">         newSet = set()
</span><del>-        for name in (u&quot;wsanchez&quot;, u&quot;cdaboo&quot;, u&quot;dre&quot;):
</del><ins>+        for name in (u&quot;wsanchez1&quot;, u&quot;cdaboo1&quot;, u&quot;dre1&quot;):
</ins><span class="cx">             record = (
</span><del>-                yield self.xmlService.recordWithShortName(
</del><ins>+                yield self.directory.recordWithShortName(
</ins><span class="cx">                     RecordType.user,
</span><span class="cx">                     name
</span><span class="cx">                 )
</span><span class="lines">@@ -134,7 +110,7 @@
</span><span class="cx">         records = (yield self.groupCacher.cachedMembers(txn, groupID))
</span><span class="cx">         self.assertEquals(
</span><span class="cx">             set([r.shortNames[0] for r in records]),
</span><del>-            set([&quot;wsanchez&quot;, &quot;cdaboo&quot;, &quot;dre&quot;])
</del><ins>+            set([&quot;wsanchez1&quot;, &quot;cdaboo1&quot;, &quot;dre1&quot;])
</ins><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx">         # Remove all members
</span><span class="lines">@@ -157,7 +133,7 @@
</span><span class="cx">         self.failUnlessFailure(txn.groupByID(42), NotFoundError)
</span><span class="cx"> 
</span><span class="cx">         uid = u&quot;__top_group_1__&quot;
</span><del>-        hash = &quot;f380860ff5e02c2433fbd4b5ed3e090c&quot;
</del><ins>+        hash = &quot;553eb54e3bbb26582198ee04541dbee4&quot;
</ins><span class="cx">         yield self.groupCacher.refreshGroup(txn, uid)
</span><span class="cx">         groupID, name, membershipHash = (yield txn.groupByUID(uid))
</span><span class="cx">         results = (yield txn.groupByID(groupID))
</span><span class="lines">@@ -174,14 +150,14 @@
</span><span class="cx">         self.assertEquals(oldExternalAssignments, {})
</span><span class="cx"> 
</span><span class="cx">         newAssignments = {
</span><del>-            u&quot;__wsanchez__&quot;: (None, u&quot;__top_group_1__&quot;)
</del><ins>+            u&quot;__wsanchez1__&quot;: (None, u&quot;__top_group_1__&quot;)
</ins><span class="cx">         }
</span><span class="cx">         yield self.groupCacher.applyExternalAssignments(txn, newAssignments)
</span><span class="cx">         oldExternalAssignments = (yield txn.externalDelegates())
</span><span class="cx">         self.assertEquals(
</span><span class="cx">             oldExternalAssignments,
</span><span class="cx">             {
</span><del>-                u&quot;__wsanchez__&quot;:
</del><ins>+                u&quot;__wsanchez1__&quot;:
</ins><span class="cx">                 (
</span><span class="cx">                     None,
</span><span class="cx">                     u&quot;__top_group_1__&quot;
</span><span class="lines">@@ -190,12 +166,12 @@
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx">         newAssignments = {
</span><del>-            u&quot;__cdaboo__&quot;:
</del><ins>+            u&quot;__cdaboo1__&quot;:
</ins><span class="cx">             (
</span><span class="cx">                 u&quot;__sub_group_1__&quot;,
</span><span class="cx">                 None
</span><span class="cx">             ),
</span><del>-            u&quot;__wsanchez__&quot;:
</del><ins>+            u&quot;__wsanchez1__&quot;:
</ins><span class="cx">             (
</span><span class="cx">                 u&quot;__sub_group_1__&quot;,
</span><span class="cx">                 u&quot;__top_group_1__&quot;
</span><span class="lines">@@ -206,12 +182,12 @@
</span><span class="cx">         self.assertEquals(
</span><span class="cx">             oldExternalAssignments,
</span><span class="cx">             {
</span><del>-                u&quot;__wsanchez__&quot;:
</del><ins>+                u&quot;__wsanchez1__&quot;:
</ins><span class="cx">                 (
</span><span class="cx">                     u&quot;__sub_group_1__&quot;,
</span><span class="cx">                     u&quot;__top_group_1__&quot;
</span><span class="cx">                 ),
</span><del>-                u&quot;__cdaboo__&quot;:
</del><ins>+                u&quot;__cdaboo1__&quot;:
</ins><span class="cx">                 (
</span><span class="cx">                     u&quot;__sub_group_1__&quot;,
</span><span class="cx">                     None
</span><span class="lines">@@ -235,14 +211,14 @@
</span><span class="cx"> 
</span><span class="cx">         # Wilfredo should have Sagen and Daboo as read-only delegates
</span><span class="cx">         delegates = (yield txn.delegates(
</span><del>-            u&quot;__wsanchez__&quot;, False, expanded=True)
</del><ins>+            u&quot;__wsanchez1__&quot;, False, expanded=True)
</ins><span class="cx">         )
</span><span class="cx">         self.assertEquals(
</span><span class="cx">             delegates,
</span><span class="cx">             set(
</span><span class="cx">                 [
</span><del>-                    u&quot;__sagen__&quot;,
-                    u&quot;__cdaboo__&quot;
</del><ins>+                    u&quot;__sagen1__&quot;,
+                    u&quot;__cdaboo1__&quot;
</ins><span class="cx">                 ]
</span><span class="cx">             )
</span><span class="cx">         )
</span><span class="lines">@@ -252,16 +228,16 @@
</span><span class="cx"> 
</span><span class="cx">         # Wilfredo should have 4 users as read-write delegates
</span><span class="cx">         delegates = (yield txn.delegates(
</span><del>-            u&quot;__wsanchez__&quot;, True, expanded=True)
</del><ins>+            u&quot;__wsanchez1__&quot;, True, expanded=True)
</ins><span class="cx">         )
</span><span class="cx">         self.assertEquals(
</span><span class="cx">             delegates,
</span><span class="cx">             set(
</span><span class="cx">                 [
</span><del>-                    u&quot;__wsanchez__&quot;,
-                    u&quot;__sagen__&quot;,
-                    u&quot;__cdaboo__&quot;,
-                    u&quot;__glyph__&quot;
</del><ins>+                    u&quot;__wsanchez1__&quot;,
+                    u&quot;__sagen1__&quot;,
+                    u&quot;__cdaboo1__&quot;,
+                    u&quot;__glyph1__&quot;
</ins><span class="cx">                 ]
</span><span class="cx">             )
</span><span class="cx">         )
</span><span class="lines">@@ -271,7 +247,7 @@
</span><span class="cx">         # Now, remove some external assignments
</span><span class="cx">         #
</span><span class="cx">         newAssignments = {
</span><del>-            u&quot;__wsanchez__&quot;:
</del><ins>+            u&quot;__wsanchez1__&quot;:
</ins><span class="cx">             (
</span><span class="cx">                 u&quot;__sub_group_1__&quot;,
</span><span class="cx">                 None
</span><span class="lines">@@ -282,7 +258,7 @@
</span><span class="cx">         self.assertEquals(
</span><span class="cx">             oldExternalAssignments,
</span><span class="cx">             {
</span><del>-                u&quot;__wsanchez__&quot;:
</del><ins>+                u&quot;__wsanchez1__&quot;:
</ins><span class="cx">                 (
</span><span class="cx">                     u&quot;__sub_group_1__&quot;,
</span><span class="cx">                     None
</span><span class="lines">@@ -302,21 +278,21 @@
</span><span class="cx"> 
</span><span class="cx">         # Wilfredo should have Sagen and Daboo as read-only delegates
</span><span class="cx">         delegates = (yield txn.delegates(
</span><del>-            u&quot;__wsanchez__&quot;, False, expanded=True)
</del><ins>+            u&quot;__wsanchez1__&quot;, False, expanded=True)
</ins><span class="cx">         )
</span><span class="cx">         self.assertEquals(
</span><span class="cx">             delegates,
</span><span class="cx">             set(
</span><span class="cx">                 [
</span><del>-                    u&quot;__sagen__&quot;,
-                    u&quot;__cdaboo__&quot;
</del><ins>+                    u&quot;__sagen1__&quot;,
+                    u&quot;__cdaboo1__&quot;
</ins><span class="cx">                 ]
</span><span class="cx">             )
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx">         # Wilfredo should have no read-write delegates
</span><span class="cx">         delegates = (yield txn.delegates(
</span><del>-            u&quot;__wsanchez__&quot;, True, expanded=True)
</del><ins>+            u&quot;__wsanchez1__&quot;, True, expanded=True)
</ins><span class="cx">         )
</span><span class="cx">         self.assertEquals(
</span><span class="cx">             delegates,
</span><span class="lines">@@ -413,74 +389,3 @@
</span><span class="cx">                 {&quot;D&quot;: (&quot;7&quot;, &quot;8&quot;), &quot;C&quot;: (&quot;4&quot;, &quot;5&quot;), &quot;A&quot;: (&quot;1&quot;, &quot;2&quot;)},
</span><span class="cx">             )
</span><span class="cx">         )
</span><del>-
-testXMLConfig = &quot;&quot;&quot;&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
-
-&lt;directory realm=&quot;xyzzy&quot;&gt;
-
-  &lt;record type=&quot;user&quot;&gt;
-    &lt;uid&gt;__wsanchez__&lt;/uid&gt;
-    &lt;short-name&gt;wsanchez&lt;/short-name&gt;
-    &lt;short-name&gt;wilfredo_sanchez&lt;/short-name&gt;
-    &lt;full-name&gt;Wilfredo Sanchez&lt;/full-name&gt;
-    &lt;password&gt;zehcnasw&lt;/password&gt;
-    &lt;email&gt;wsanchez@bitbucket.calendarserver.org&lt;/email&gt;
-    &lt;email&gt;wsanchez@devnull.twistedmatrix.com&lt;/email&gt;
-  &lt;/record&gt;
-
-  &lt;record type=&quot;user&quot;&gt;
-    &lt;uid&gt;__glyph__&lt;/uid&gt;
-    &lt;short-name&gt;glyph&lt;/short-name&gt;
-    &lt;full-name&gt;Glyph Lefkowitz&lt;/full-name&gt;
-    &lt;password&gt;hpylg&lt;/password&gt;
-    &lt;email&gt;glyph@bitbucket.calendarserver.org&lt;/email&gt;
-    &lt;email&gt;glyph@devnull.twistedmatrix.com&lt;/email&gt;
-  &lt;/record&gt;
-
-  &lt;record type=&quot;user&quot;&gt;
-    &lt;uid&gt;__sagen__&lt;/uid&gt;
-    &lt;short-name&gt;sagen&lt;/short-name&gt;
-    &lt;full-name&gt;Morgen Sagen&lt;/full-name&gt;
-    &lt;password&gt;negas&lt;/password&gt;
-    &lt;email&gt;sagen@bitbucket.calendarserver.org&lt;/email&gt;
-    &lt;email&gt;shared@example.com&lt;/email&gt;
-  &lt;/record&gt;
-
-  &lt;record type=&quot;user&quot;&gt;
-    &lt;uid&gt;__cdaboo__&lt;/uid&gt;
-    &lt;short-name&gt;cdaboo&lt;/short-name&gt;
-    &lt;full-name&gt;Cyrus Daboo&lt;/full-name&gt;
-    &lt;password&gt;suryc&lt;/password&gt;
-    &lt;email&gt;cdaboo@bitbucket.calendarserver.org&lt;/email&gt;
-  &lt;/record&gt;
-
-  &lt;record type=&quot;user&quot;&gt;
-    &lt;uid&gt;__dre__&lt;/uid&gt;
-    &lt;short-name&gt;dre&lt;/short-name&gt;
-    &lt;full-name&gt;Andre LaBranche&lt;/full-name&gt;
-    &lt;password&gt;erd&lt;/password&gt;
-    &lt;email&gt;dre@bitbucket.calendarserver.org&lt;/email&gt;
-    &lt;email&gt;shared@example.com&lt;/email&gt;
-  &lt;/record&gt;
-
-  &lt;record type=&quot;group&quot;&gt;
-    &lt;uid&gt;__top_group_1__&lt;/uid&gt;
-    &lt;short-name&gt;top-group-1&lt;/short-name&gt;
-    &lt;full-name&gt;Top Group 1&lt;/full-name&gt;
-    &lt;email&gt;topgroup1@example.com&lt;/email&gt;
-    &lt;member-uid&gt;__wsanchez__&lt;/member-uid&gt;
-    &lt;member-uid&gt;__glyph__&lt;/member-uid&gt;
-    &lt;member-uid&gt;__sub_group_1__&lt;/member-uid&gt;
-  &lt;/record&gt;
-
-  &lt;record type=&quot;group&quot;&gt;
-    &lt;uid&gt;__sub_group_1__&lt;/uid&gt;
-    &lt;short-name&gt;sub-group-1&lt;/short-name&gt;
-    &lt;full-name&gt;Sub Group 1&lt;/full-name&gt;
-    &lt;email&gt;subgroup1@example.com&lt;/email&gt;
-    &lt;member-uid&gt;__sagen__&lt;/member-uid&gt;
-    &lt;member-uid&gt;__cdaboo__&lt;/member-uid&gt;
-  &lt;/record&gt;
-
-&lt;/directory&gt;
-&quot;&quot;&quot;
</del></span></pre>
</div>
</div>

</body>
</html>