<!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>[15510] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/15510">15510</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-04-15 12:11:37 -0700 (Fri, 15 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure calendarserver_manage_principals proxy changes invalidate the principal PROPFIND cache.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverprovisionrootpy">CalendarServer/trunk/calendarserver/provision/root.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsprincipalspy">CalendarServer/trunk/calendarserver/tools/principals.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsutilpy">CalendarServer/trunk/calendarserver/tools/util.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavcachepy">CalendarServer/trunk/twistedcaldav/cache.py</a></li>
<li><a href="#CalendarServertrunktxdavwhodelegatespy">CalendarServer/trunk/txdav/who/delegates.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_delegatespy">CalendarServer/trunk/txdav/who/test/test_delegates.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverprovisionrootpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/provision/root.py (15509 => 15510)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/provision/root.py 2016-04-15 19:11:01 UTC (rev 15509)
+++ CalendarServer/trunk/calendarserver/provision/root.py 2016-04-15 19:11:37 UTC (rev 15510)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> from twistedcaldav.extensions import DirectoryPrincipalPropertySearchMixIn
</span><span class="cx"> from twistedcaldav.extensions import ReadOnlyResourceMixIn
</span><span class="cx"> from twistedcaldav.resource import CalDAVComplianceMixIn
</span><ins>+from txdav.who.delegates import CachingDelegates
</ins><span class="cx"> from txdav.who.wiki import DirectoryService as WikiDirectoryService
</span><span class="cx"> from txdav.who.wiki import uidForAuthToken
</span><span class="cx"> from txweb2 import responsecode
</span><span class="lines">@@ -93,9 +94,8 @@
</span><span class="cx">
</span><span class="cx"> # These class attributes need to be setup with our memcache\
</span><span class="cx"> # notifier
</span><del>- DirectoryPrincipalResource.cacheNotifierFactory = (
- MemcacheChangeNotifier
- )
</del><ins>+ DirectoryPrincipalResource.cacheNotifierFactory = MemcacheChangeNotifier
+ CachingDelegates.cacheNotifier = MemcacheChangeNotifier(None, cacheHandle="PrincipalToken")
</ins><span class="cx"> else:
</span><span class="cx"> self.responseCache = DisabledCache()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsprincipalspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/principals.py (15509 => 15510)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/principals.py 2016-04-15 19:11:01 UTC (rev 15509)
+++ CalendarServer/trunk/calendarserver/tools/principals.py 2016-04-15 19:11:37 UTC (rev 15510)
</span><span class="lines">@@ -39,7 +39,9 @@
</span><span class="cx"> from twisted.internet import reactor
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span><span class="cx"> from twistedcaldav.config import config
</span><del>-from txdav.who.delegates import Delegates, RecordType as DelegateRecordType
</del><ins>+from twistedcaldav.cache import MemcacheChangeNotifier
+from txdav.who.delegates import Delegates, RecordType as DelegateRecordType, \
+ CachingDelegates
</ins><span class="cx"> from txdav.who.idirectory import AutoScheduleMode
</span><span class="cx"> from txdav.who.groups import GroupCacherPollingWork
</span><span class="cx">
</span><span class="lines">@@ -125,12 +127,21 @@
</span><span class="cx"> Calls the function that's been assigned to "function" and passes the root
</span><span class="cx"> resource, directory, store, and whatever has been assigned to "params".
</span><span class="cx"> """
</span><ins>+ if (
+ config.EnableResponseCache and
+ config.Memcached.Pools.Default.ClientEnabled
+ ):
+ # These class attributes need to be setup with our memcache\
+ # notifier
+ CachingDelegates.cacheNotifier = MemcacheChangeNotifier(None, cacheHandle="PrincipalToken")
+
</ins><span class="cx"> if self.function is not None:
</span><span class="cx"> yield self.function(self.store, *self.params)
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def main():
</span><ins>+
</ins><span class="cx"> try:
</span><span class="cx"> (optargs, args) = getopt(
</span><span class="cx"> sys.argv[1:], "a:hf:P:v", [
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/util.py (15509 => 15510)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/util.py 2016-04-15 19:11:01 UTC (rev 15509)
+++ CalendarServer/trunk/calendarserver/tools/util.py 2016-04-15 19:11:37 UTC (rev 15510)
</span><span class="lines">@@ -100,9 +100,14 @@
</span><span class="cx"> for pool in config.Memcached.Pools.itervalues():
</span><span class="cx"> if pool.ClientEnabled:
</span><span class="cx"> try:
</span><del>- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- s.connect((pool.BindAddress, pool.Port))
- s.close()
</del><ins>+ if pool.MemcacheSocket:
+ s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+ s.connect(pool.MemcacheSocket)
+ s.close()
+ else:
+ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ s.connect((pool.BindAddress, pool.Port))
+ s.close()
</ins><span class="cx">
</span><span class="cx"> except socket.error:
</span><span class="cx"> pool.ClientEnabled = False
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavcachepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/cache.py (15509 => 15510)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/cache.py 2016-04-15 19:11:01 UTC (rev 15509)
+++ CalendarServer/trunk/twistedcaldav/cache.py 2016-04-15 19:11:37 UTC (rev 15510)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="cx">
</span><del>- def changed(self):
</del><ins>+ def changed(self, url=None):
</ins><span class="cx"> return succeed(None)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -118,15 +118,20 @@
</span><span class="cx"> return str(uuid.uuid4())
</span><span class="cx">
</span><span class="cx">
</span><del>- def changed(self):
</del><ins>+ def changed(self, url=None):
</ins><span class="cx"> """
</span><span class="cx"> Change the cache token for a resource
</span><span class="cx">
</span><ins>+ @param url: the url whose token is being changed, or C{None} to determine
+ the URL from the supplied resource
+ @type: L{str}
+
</ins><span class="cx"> return: A L{Deferred} that fires when the token has been changed.
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # For shared resources we use the owner URL as the cache key
</span><del>- url = self._resource.url()
</del><ins>+ if url is None:
+ url = self._resource.url()
</ins><span class="cx">
</span><span class="cx"> self.log.debug("Changing Cache Token for {url}", url=url)
</span><span class="cx"> return self.getCachePool().set(
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhodelegatespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/delegates.py (15509 => 15510)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/delegates.py 2016-04-15 19:11:01 UTC (rev 15509)
+++ CalendarServer/trunk/txdav/who/delegates.py 2016-04-15 19:11:37 UTC (rev 15510)
</span><span class="lines">@@ -233,6 +233,8 @@
</span><span class="cx"> Manages access to the store's delegates API, including caching of results.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ cacheNotifier = None
+
</ins><span class="cx"> class DelegatesMemcacher(Memcacher):
</span><span class="cx">
</span><span class="cx"> def __init__(self, namespace):
</span><span class="lines">@@ -358,6 +360,11 @@
</span><span class="cx"> else:
</span><span class="cx"> yield txn.addDelegate(delegator.uid, delegate.uid, readWrite)
</span><span class="cx">
</span><ins>+ # Make sure notifications are sent
+ if self.cacheNotifier is not None:
+ yield self.cacheNotifier.changed("/principals/__uids__/{}/".format(delegator.uid))
+ yield self.cacheNotifier.changed("/principals/__uids__/{}/".format(delegate.uid))
+
</ins><span class="cx"> # Update cache (remove the member cache entry first as we need to recalculate it for
</span><span class="cx"> # memberships removal)
</span><span class="cx"> yield self._memcacher.deleteMember(delegator.uid, readWrite)
</span><span class="lines">@@ -393,6 +400,11 @@
</span><span class="cx"> else:
</span><span class="cx"> yield txn.removeDelegate(delegator.uid, delegate.uid, readWrite)
</span><span class="cx">
</span><ins>+ # Make sure notifications are sent
+ if self.cacheNotifier is not None:
+ yield self.cacheNotifier.changed("/principals/__uids__/{}/".format(delegator.uid))
+ yield self.cacheNotifier.changed("/principals/__uids__/{}/".format(delegate.uid))
+
</ins><span class="cx"> # Update cache (remove the member cache entry first as we need to recalculate it for
</span><span class="cx"> # memberships removal)
</span><span class="cx"> yield self._memcacher.deleteMember(delegator.uid, readWrite)
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_delegatespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_delegates.py (15509 => 15510)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_delegates.py 2016-04-15 19:11:01 UTC (rev 15509)
+++ CalendarServer/trunk/txdav/who/test/test_delegates.py 2016-04-15 19:11:37 UTC (rev 15510)
</span><span class="lines">@@ -21,13 +21,29 @@
</span><span class="cx"> from txdav.common.datastore.sql import CommonStoreTransaction
</span><span class="cx"> from txdav.common.datastore.sql_directory import DelegateRecord, \
</span><span class="cx"> DelegateGroupsRecord
</span><del>-from txdav.who.delegates import Delegates, RecordType as DelegateRecordType
</del><ins>+from txdav.who.delegates import Delegates, RecordType as DelegateRecordType, \
+ CachingDelegates
</ins><span class="cx"> from txdav.who.groups import GroupCacher
</span><span class="cx"> from twext.who.idirectory import RecordType
</span><del>-from twisted.internet.defer import inlineCallbacks
</del><ins>+from twisted.internet.defer import inlineCallbacks, succeed
</ins><span class="cx"> from twistedcaldav.test.util import StoreTestCase
</span><span class="cx">
</span><span class="cx">
</span><ins>+class CapturingCacheNotifier(object):
+ def __init__(self, *args, **kwargs):
+ self.history = []
+
+
+ def changed(self, url=None):
+ self.history.append(url)
+ return succeed(None)
+
+
+ def clear(self):
+ self.history = []
+
+
+
</ins><span class="cx"> class DelegationTest(StoreTestCase):
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -301,7 +317,9 @@
</span><span class="cx">
</span><span class="cx"> yield Delegates._memcacher.flushAll()
</span><span class="cx">
</span><ins>+ self.patch(CachingDelegates, "cacheNotifier", CapturingCacheNotifier())
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _memcacherMemberResults(self, delegate, readWrite, expanded, results):
</span><span class="cx"> delegateUIDs = yield Delegates._memcacher.getMembers(delegate.uid, readWrite, expanded)
</span><span class="lines">@@ -447,6 +465,10 @@
</span><span class="cx"> yield Delegates.addDelegate(self.transactionUnderTest(), delegator, delegate1, True)
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # Notifications
+ self.assertEqual(set(Delegates.cacheNotifier.history), set((u"/principals/__uids__/__wsanchez1__/", u"/principals/__uids__/__sagen1__/",))) #@UndefinedVariable
+ Delegates.cacheNotifier.clear() #@UndefinedVariable
+
</ins><span class="cx"> # Some cache entries invalid
</span><span class="cx"> yield self._memcacherAllMemberResults(delegator, None, [delegate1], None, None)
</span><span class="cx"> yield self._memcacherAllMemberResults(delegate1, None, None, None, None)
</span><span class="lines">@@ -499,6 +521,10 @@
</span><span class="cx"> yield Delegates.removeDelegate(self.transactionUnderTest(), delegator, delegate1, True)
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # Notifications
+ self.assertEqual(set(Delegates.cacheNotifier.history), set((u"/principals/__uids__/__wsanchez1__/", u"/principals/__uids__/__sagen1__/",))) #@UndefinedVariable
+ Delegates.cacheNotifier.clear() #@UndefinedVariable
+
</ins><span class="cx"> # Some cache entries invalid
</span><span class="cx"> yield self._memcacherAllMemberResults(delegator, None, [], [], [])
</span><span class="cx"> yield self._memcacherAllMemberResults(delegate1, [], [], [], [])
</span><span class="lines">@@ -562,6 +588,10 @@
</span><span class="cx"> yield Delegates.setDelegates(self.transactionUnderTest(), delegator, [delegates[0], delegates[1]], True)
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # Notifications
+ self.assertEqual(set(Delegates.cacheNotifier.history), set((u"/principals/__uids__/__wsanchez1__/", u"/principals/__uids__/__sagen1__/", u"/principals/__uids__/__cdaboo1__/",))) #@UndefinedVariable
+ Delegates.cacheNotifier.clear() #@UndefinedVariable
+
</ins><span class="cx"> # Some cache entries invalid
</span><span class="cx"> yield self._memcacherAllMemberResults(delegator, None, [delegates[0], delegates[1]], None, None)
</span><span class="cx"> yield self._memcacherAllMembershipResults(delegator, None, None)
</span><span class="lines">@@ -593,6 +623,10 @@
</span><span class="cx"> yield Delegates.setDelegates(self.transactionUnderTest(), delegator, [delegates[1], delegates[2]], True)
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # Notifications
+ self.assertEqual(set(Delegates.cacheNotifier.history), set((u"/principals/__uids__/__wsanchez1__/", u"/principals/__uids__/__sagen1__/", u"/principals/__uids__/__dre1__/"))) #@UndefinedVariable
+ Delegates.cacheNotifier.clear() #@UndefinedVariable
+
</ins><span class="cx"> # Some cache entries invalid
</span><span class="cx"> yield self._memcacherAllMemberResults(delegator, None, [delegates[1], delegates[2]], [], [])
</span><span class="cx"> for delegate in delegates:
</span><span class="lines">@@ -626,6 +660,10 @@
</span><span class="cx"> yield Delegates.setDelegates(self.transactionUnderTest(), delegator, [delegates[0]], False)
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # Notifications
+ self.assertEqual(set(Delegates.cacheNotifier.history), set((u"/principals/__uids__/__wsanchez1__/", u"/principals/__uids__/__sagen1__/"))) #@UndefinedVariable
+ Delegates.cacheNotifier.clear() #@UndefinedVariable
+
</ins><span class="cx"> # Some cache entries invalid
</span><span class="cx"> yield self._memcacherAllMemberResults(delegator, [delegates[1], delegates[2]], [delegates[1], delegates[2]], None, [delegates[0]])
</span><span class="cx"> for delegate in delegates:
</span><span class="lines">@@ -679,6 +717,10 @@
</span><span class="cx"> yield Delegates.setDelegates(self.transactionUnderTest(), delegator, [group1], True)
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # Notifications
+ self.assertEqual(set(Delegates.cacheNotifier.history), set((u"/principals/__uids__/__wsanchez1__/", u"/principals/__uids__/__top_group_1__/",))) #@UndefinedVariable
+ Delegates.cacheNotifier.clear() #@UndefinedVariable
+
</ins><span class="cx"> # Some cache entries invalid
</span><span class="cx"> yield self._memcacherAllMemberResults(delegator, None, delegateMatch(0, 1, 2), None, None)
</span><span class="cx"> yield self._memcacherAllMembershipResults(delegator, None, None)
</span><span class="lines">@@ -712,6 +754,10 @@
</span><span class="cx"> yield Delegates.setDelegates(self.transactionUnderTest(), delegator, [group1, delegates[3]], True)
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # Notifications
+ self.assertEqual(set(Delegates.cacheNotifier.history), set((u"/principals/__uids__/__wsanchez1__/", u"/principals/__uids__/__dre1__/"))) #@UndefinedVariable
+ Delegates.cacheNotifier.clear() #@UndefinedVariable
+
</ins><span class="cx"> # Some cache entries invalid
</span><span class="cx"> yield self._memcacherAllMemberResults(delegator, None, delegateMatch(0, 1, 2, 3), [], [])
</span><span class="cx"> for delegate in delegates:
</span><span class="lines">@@ -748,6 +794,10 @@
</span><span class="cx"> yield Delegates.setDelegates(self.transactionUnderTest(), delegator, [group2, delegates[3]], True)
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # Notifications
+ self.assertEqual(set(Delegates.cacheNotifier.history), set((u"/principals/__uids__/__wsanchez1__/", u"/principals/__uids__/__top_group_1__/", u"/principals/__uids__/__sub_group_1__/"))) #@UndefinedVariable
+ Delegates.cacheNotifier.clear() #@UndefinedVariable
+
</ins><span class="cx"> # Some cache entries invalid
</span><span class="cx"> yield self._memcacherAllMemberResults(delegator, None, delegateMatch(0, 1, 3), [], [])
</span><span class="cx"> for delegate in delegates:
</span><span class="lines">@@ -784,6 +834,10 @@
</span><span class="cx"> yield Delegates.setDelegates(self.transactionUnderTest(), delegator, [group2, delegates[0], delegates[3]], True)
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # Notifications
+ self.assertEqual(set(Delegates.cacheNotifier.history), set((u"/principals/__uids__/__wsanchez1__/", u"/principals/__uids__/__sagen1__/"))) #@UndefinedVariable
+ Delegates.cacheNotifier.clear() #@UndefinedVariable
+
</ins><span class="cx"> # Some cache entries invalid
</span><span class="cx"> yield self._memcacherAllMemberResults(delegator, None, delegateMatch(0, 1, 3), [], [])
</span><span class="cx"> for delegate in delegates:
</span><span class="lines">@@ -820,6 +874,10 @@
</span><span class="cx"> yield Delegates.setDelegates(self.transactionUnderTest(), delegator, [delegates[0], delegates[3]], True)
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # Notifications
+ self.assertEqual(set(Delegates.cacheNotifier.history), set((u"/principals/__uids__/__wsanchez1__/", u"/principals/__uids__/__sub_group_1__/"))) #@UndefinedVariable
+ Delegates.cacheNotifier.clear() #@UndefinedVariable
+
</ins><span class="cx"> # Some cache entries invalid
</span><span class="cx"> yield self._memcacherAllMemberResults(delegator, None, delegateMatch(0, 3), [], [])
</span><span class="cx"> for delegate in delegates:
</span></span></pre>
</div>
</div>
</body>
</html>