<!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>[12323] CalendarServer/branches/users/gaya/cleanrevisions</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/12323">12323</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-01-12 18:18:31 -0800 (Sun, 12 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>fix RevisionCleanupTests.test_addressbookMembersRevisions</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstwistedcaldavstdconfigpy">CalendarServer/branches/users/gaya/cleanrevisions/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoresqlpy">CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworkrevision_cleanuppy">CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py</a></li>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworktesttest_revision_cleanuppy">CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersgayacleanrevisionstwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/twistedcaldav/stdconfig.py (12322 => 12323)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/twistedcaldav/stdconfig.py        2014-01-12 19:10:08 UTC (rev 12322)
+++ CalendarServer/branches/users/gaya/cleanrevisions/twistedcaldav/stdconfig.py        2014-01-13 02:18:31 UTC (rev 12323)
</span><span class="lines">@@ -634,8 +634,8 @@
</span><span class="cx"> 
</span><span class="cx">     &quot;SyncTokenLifetimeDays&quot; : 14,       # Number of days that a client sync report token is valid
</span><span class="cx">     &quot;RevisionCleanupPeriodDays&quot; : 2,    # Number of days between revision cleanups
</span><ins>+    &quot;RescheduleRevisionWork&quot; : True,    # automatically reschedule revision work
</ins><span class="cx"> 
</span><del>-
</del><span class="cx">     # CardDAV Features
</span><span class="cx">     &quot;DirectoryAddressBook&quot;: {
</span><span class="cx">         &quot;Enabled&quot;: True,
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql.py (12322 => 12323)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql.py        2014-01-12 19:10:08 UTC (rev 12322)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql.py        2014-01-13 02:18:31 UTC (rev 12323)
</span><span class="lines">@@ -6816,25 +6816,31 @@
</span><span class="cx">     # go though list an delete old revisions, leaving at least one unremoved member
</span><span class="cx">     for groupID, memberIDToRevisionsMap in groupIDToMemberIDMap.iteritems():
</span><span class="cx">         for memberID, revisionInfoList in memberIDToRevisionsMap.iteritems():
</span><del>-
-            revisionsToRemove = []
-            maxRevisionInfoToRemove = None
-            revisionsToSave = []
</del><ins>+            revisionInfosToRemove = []
+            revisionInfosToSave = []
</ins><span class="cx">             for revisionInfo in revisionInfoList:
</span><del>-                removed, revision = revisionInfo
-                if revision &lt; minRevision:
-                    revisionsToRemove.append(revision)
-                    if not maxRevisionInfoToRemove or revision &gt; maxRevisionInfoToRemove[1]:
-                        maxRevisionInfoToRemove = revisionInfo
</del><ins>+                if revisionInfo[1] &lt; minRevision:
+                    revisionInfosToRemove.append(revisionInfo)
</ins><span class="cx">                 else:
</span><del>-                    revisionsToSave.append(revision)
</del><ins>+                    revisionInfosToSave.append(revisionInfo)
</ins><span class="cx"> 
</span><del>-            if revisionsToRemove and (revisionsToSave or maxRevisionInfoToRemove[0]):
-                aboMembers = schema.ABO_MEMBERS
</del><ins>+            # save at least one revision
+            if revisionInfosToRemove and len(revisionInfosToRemove) == len(revisionInfoList):
+                maxRevisionInfoToRemove = max(revisionInfosToRemove, key=lambda info: info[1])
+                revisionInfosToSave.append(maxRevisionInfoToRemove)
+                revisionInfosToRemove.remove(maxRevisionInfoToRemove)
+
+            # get rid of extra removed member revision
+            if revisionInfosToSave and max(revisionInfosToSave, key=lambda info: not info[0])[0]:
+                revisionInfosToRemove += revisionInfosToSave
+
+            if revisionInfosToRemove:
+                revisionsToRemove = [revisionInfoToRemove[1] for revisionInfoToRemove in revisionInfosToRemove]
</ins><span class="cx">                 yield Delete(
</span><span class="cx">                     aboMembers,
</span><span class="cx">                     Where=(aboMembers.GROUP_ID == groupID).And(
</span><span class="cx">                         aboMembers.MEMBER_ID == memberID).And(
</span><del>-                            aboMembers.REVISION.In(revisionsToRemove)
</del><ins>+                            aboMembers.REVISION.In(Parameter(&quot;revisionsToRemove&quot;, len(revisionsToRemove)))
</ins><span class="cx">                         )
</span><del>-                )
</del><ins>+                ).on(txn, revisionsToRemove=revisionsToRemove)
+
</ins></span></pre></div>
<a id="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworkrevision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py (12322 => 12323)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py        2014-01-12 19:10:08 UTC (rev 12322)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py        2014-01-13 02:18:31 UTC (rev 12323)
</span><span class="lines">@@ -82,11 +82,12 @@
</span><span class="cx">                 Where=cs.NAME == &quot;MIN-VALID-REVISION&quot;,
</span><span class="cx">             ).on(self.transaction)
</span><span class="cx"> 
</span><del>-            # Schedule revision cleanup
-            log.debug(&quot;Scheduling revision cleanup now&quot;)
-            yield self.transaction.enqueue(RevisionCleanupWork, notBefore=datetime.datetime.utcnow())
</del><ins>+            if config.RescheduleRevisionWork:
+                # Schedule revision cleanup
+                log.debug(&quot;Scheduling revision cleanup now&quot;)
+                yield self.transaction.enqueue(RevisionCleanupWork, notBefore=datetime.datetime.utcnow())
</ins><span class="cx"> 
</span><del>-        else:
</del><ins>+        elif config.RescheduleRevisionWork:
</ins><span class="cx">             # Schedule next update
</span><span class="cx">             notBefore = (datetime.datetime.utcnow() +
</span><span class="cx">                 datetime.timedelta(days=float(config.RevisionCleanupPeriodDays)))
</span><span class="lines">@@ -119,11 +120,11 @@
</span><span class="cx">         yield deleteRevisionsBefore(self.transaction, minValidRevision)
</span><span class="cx"> 
</span><span class="cx">         # Schedule next update
</span><del>-        notBefore = (datetime.datetime.utcnow() +
-            datetime.timedelta(days=float(config.RevisionCleanupPeriodDays)))
-        log.debug(&quot;Rescheduling find minimum valid revision work: %s&quot; % (notBefore,))
-        yield self.transaction.enqueue(FindMinValidRevisionWork,
-            notBefore=notBefore)
</del><ins>+        if config.RescheduleRevisionWork:
+            notBefore = (datetime.datetime.utcnow() +
+                datetime.timedelta(days=float(config.RevisionCleanupPeriodDays)))
+            log.debug(&quot;Rescheduling find minimum valid revision work: %s&quot; % (notBefore,))
+            yield self.transaction.enqueue(FindMinValidRevisionWork, notBefore=notBefore)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworktesttest_revision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py (12322 => 12323)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py        2014-01-12 19:10:08 UTC (rev 12322)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py        2014-01-13 02:18:31 UTC (rev 12323)
</span><span class="lines">@@ -18,13 +18,13 @@
</span><span class="cx"> 
</span><span class="cx"> from twext.enterprise.dal.syntax import Select
</span><span class="cx"> from twext.python.clsprop import classproperty
</span><del>-from twisted.internet.defer import inlineCallbacks, returnValue
</del><ins>+from twisted.internet.defer import inlineCallbacks
</ins><span class="cx"> from twisted.trial.unittest import TestCase
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.vcard import Component as VCard
</span><del>-from txdav.common.datastore.sql_tables import  schema, _BIND_MODE_READ
</del><ins>+from txdav.common.datastore.sql_tables import  schema
</ins><span class="cx"> from txdav.common.datastore.test.util import buildStore, CommonCommonTests
</span><del>-from txdav.common.datastore.work.revision_cleanup import FindMinValidRevisionWork
</del><ins>+from txdav.common.datastore.work.revision_cleanup import FindMinValidRevisionWork, RevisionCleanupWork
</ins><span class="cx"> from txdav.common.icommondatastore import SyncTokenValidException
</span><span class="cx"> import datetime
</span><span class="cx"> 
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">         self._sqlStore = yield buildStore(self, self.notifierFactory)
</span><span class="cx">         yield self.populate()
</span><span class="cx">         self.patch(config, &quot;SyncTokenLifetimeDays&quot;, 0)
</span><ins>+        self.patch(config, &quot;RescheduleRevisionWork&quot;, False)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><span class="lines">@@ -110,7 +111,24 @@
</span><span class="cx"> END:VCARD
</span><span class="cx"> &quot;&quot;&quot;
</span><span class="cx"> 
</span><ins>+    group1Empty = &quot;&quot;&quot;BEGIN:VCARD
+VERSION:3.0
+UID:group1
+FN:Group 1
+N:group1;;;;
+X-ADDRESSBOOKSERVER-KIND:group
+END:VCARD
+&quot;&quot;&quot;
</ins><span class="cx"> 
</span><ins>+    group2Empty = &quot;&quot;&quot;BEGIN:VCARD
+VERSION:3.0
+UID:group2
+FN:Group 2
+N:group2;;;;
+X-ADDRESSBOOKSERVER-KIND:group
+END:VCARD
+&quot;&quot;&quot;
+
</ins><span class="cx">     @classproperty(cache=False)
</span><span class="cx">     def requirements(cls): #@NoSelf
</span><span class="cx">         return {
</span><span class="lines">@@ -141,75 +159,15 @@
</span><span class="cx">         return self._sqlStore
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    @inlineCallbacks
-    def _createShare(self, mode=_BIND_MODE_READ):
-        inviteUID = yield self._inviteShare(mode)
-        sharedName = yield self._acceptShare(inviteUID)
-        returnValue(sharedName)
-
-
-    @inlineCallbacks
-    def _inviteShare(self, mode=_BIND_MODE_READ):
-        # Invite
-        addressbook = yield self.addressbookUnderTest(home=&quot;user01&quot;, name=&quot;addressbook&quot;)
-        invites = yield addressbook.sharingInvites()
-        self.assertEqual(len(invites), 0)
-
-        shareeView = yield addressbook.inviteUserToShare(&quot;user02&quot;, mode, &quot;summary&quot;)
-        inviteUID = shareeView.shareUID()
-        yield self.commit()
-
-        returnValue(inviteUID)
-
-
-    @inlineCallbacks
-    def _acceptShare(self, inviteUID):
-        # Accept
-        shareeHome = yield self.addressbookHomeUnderTest(name=&quot;user02&quot;)
-        shareeView = yield shareeHome.acceptShare(inviteUID)
-        sharedName = shareeView.name()
-        yield self.commit()
-
-        returnValue(sharedName)
-
-
-    @inlineCallbacks
-    def _createGroupShare(self, groupname=&quot;group1.vcf&quot;, mode=_BIND_MODE_READ):
-        inviteUID = yield self._inviteGroupShare(groupname, mode)
-        sharedName = yield self._acceptGroupShare(inviteUID)
-        returnValue(sharedName)
-
-
-    @inlineCallbacks
-    def _inviteGroupShare(self, groupname=&quot;group1.vcf&quot;, mode=_BIND_MODE_READ):
-        # Invite
-        group = yield self.addressbookObjectUnderTest(home=&quot;user01&quot;, addressbook_name=&quot;addressbook&quot;, name=groupname)
-        shareeView = yield group.inviteUserToShare(&quot;user02&quot;, mode, &quot;summary&quot;)
-        inviteUID = shareeView.shareUID()
-        yield self.commit()
-
-        returnValue(inviteUID)
-
-
-    @inlineCallbacks
-    def _acceptGroupShare(self, inviteUID):
-        # Accept
-        shareeHome = yield self.addressbookHomeUnderTest(name=&quot;user02&quot;)
-        yield shareeHome.acceptShare(inviteUID)
-        yield self.commit()
-
-        returnValue(inviteUID)
-
-
-    def test_CalendarObjectRevisions(self):
</del><ins>+    def test_calendarObjectRevisions(self):
</ins><span class="cx">         pass
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    def test_AddressBookObjectRevisions(self):
</del><ins>+    def test_notificationObjectRevisions(self):
</ins><span class="cx">         pass
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    def test_notificationObjectRevisions(self):
</del><ins>+    def test_addressbookObjectRevisions(self):
</ins><span class="cx">         pass
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -219,123 +177,46 @@
</span><span class="cx">         Verify that resourceNamesSinceRevision returns all resources after initial bind and sync.
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx"> 
</span><del>-        #normalAB = yield self.addressbookUnderTest(home=&quot;user01&quot;, name=&quot;addressbook&quot;)
-        groupObject = yield self.addressbookObjectUnderTest(self.transactionUnderTest(), name=&quot;group1.vcf&quot;, addressbook_name=&quot;addressbook&quot;, home=&quot;user01&quot;)
-        print(&quot;test_addressbookMembersRevisions sharedGroupObject= %s&quot; % (groupObject,))
</del><ins>+        # get sync token
+        addressbook = yield self.addressbookUnderTest(home=&quot;user01&quot;, name=&quot;addressbook&quot;)
+        token = yield addressbook.syncToken()
</ins><span class="cx"> 
</span><del>-        # Get revisions
-        # get groups where this object was once a member and version info
-        aboMembers = schema.ABO_MEMBERS
-        groupRows = yield Select(
-            [aboMembers.GROUP_ID,
-             aboMembers.MEMBER_ID,
-             aboMembers.REMOVED,
-             aboMembers.REVISION],
-            From=aboMembers,
-            Where=aboMembers.GROUP_ID == groupObject._resourceID,
-        ).on(self.transactionUnderTest())
-
-        print(&quot;test_addressbookMembersRevisions groupRows= %s&quot; % (groupRows,))
-
-        group1Empty = &quot;&quot;&quot;BEGIN:VCARD
-VERSION:3.0
-UID:group1
-FN:Group 1
-N:group1;;;;
-X-ADDRESSBOOKSERVER-KIND:group
-END:VCARD
-&quot;&quot;&quot;
-        groupEmptyVCard = VCard.fromString(group1Empty.replace(&quot;\n&quot;, &quot;\r\n&quot;))
-        yield groupObject.setComponent(groupEmptyVCard)
</del><ins>+        # generate 3 revisions per member of group1
+        group1Object = yield self.addressbookObjectUnderTest(self.transactionUnderTest(), name=&quot;group1.vcf&quot;, addressbook_name=&quot;addressbook&quot;, home=&quot;user01&quot;)
+        yield group1Object.setComponent(VCard.fromString(self.group1Empty))
</ins><span class="cx">         self.commit()
</span><ins>+        group1Object = yield self.addressbookObjectUnderTest(self.transactionUnderTest(), name=&quot;group1.vcf&quot;, addressbook_name=&quot;addressbook&quot;, home=&quot;user01&quot;)
+        yield group1Object.setComponent(VCard.fromString(self.group1))
+        self.commit()
</ins><span class="cx"> 
</span><del>-        yield self._createGroupShare(groupname=&quot;group1.vcf&quot;)
-
-        #normalAB = yield self.addressbookUnderTest(home=&quot;user01&quot;, name=&quot;addressbook&quot;)
-        groupObject = yield self.addressbookObjectUnderTest(self.transactionUnderTest(), name=&quot;group1.vcf&quot;, addressbook_name=&quot;addressbook&quot;, home=&quot;user01&quot;)
-        print(&quot;test_addressbookMembersRevisions sharedGroupObject= %s&quot; % (groupObject,))
-
-        # Get revisions
-        # get groups where this object was once a member and version info
-        aboMembers = schema.ABO_MEMBERS
-        groupRows = yield Select(
-            [aboMembers.MEMBER_ID,
-             aboMembers.REMOVED,
-             aboMembers.REVISION],
-            From=aboMembers,
-            Where=aboMembers.GROUP_ID == groupObject._resourceID,
-        ).on(self.transactionUnderTest())
-
-        print(&quot;test_addressbookMembersRevisions groupRows= %s&quot; % (groupRows,))
-
-        group1vCard = VCard.fromString(self.group1.replace(&quot;\n&quot;, &quot;\r\n&quot;))
-        yield groupObject.setComponent(group1vCard)
</del><ins>+        # generate 2 revisions per member of group2, and make max revision of group1 members &lt; max revision used
+        group2Object = yield self.addressbookObjectUnderTest(self.transactionUnderTest(), name=&quot;group2.vcf&quot;, addressbook_name=&quot;addressbook&quot;, home=&quot;user01&quot;)
+        yield group2Object.setComponent(VCard.fromString(self.group2Empty))
</ins><span class="cx">         self.commit()
</span><span class="cx"> 
</span><del>-        #normalAB = yield self.addressbookUnderTest(home=&quot;user01&quot;, name=&quot;addressbook&quot;)
-        groupObject = yield self.addressbookObjectUnderTest(self.transactionUnderTest(), name=&quot;group1.vcf&quot;, addressbook_name=&quot;addressbook&quot;, home=&quot;user01&quot;)
-        print(&quot;test_addressbookMembersRevisions sharedGroupObject= %s&quot; % (groupObject,))
-
-        # Get revisions
-        # get groups where this object was once a member and version info
</del><ins>+        # Get group1 revisions
</ins><span class="cx">         aboMembers = schema.ABO_MEMBERS
</span><del>-        groupRows = yield Select(
-            [aboMembers.MEMBER_ID,
</del><ins>+        group1Rows = yield Select(
+            [aboMembers.GROUP_ID,
+             aboMembers.MEMBER_ID,
</ins><span class="cx">              aboMembers.REMOVED,
</span><span class="cx">              aboMembers.REVISION],
</span><span class="cx">             From=aboMembers,
</span><del>-            Where=aboMembers.GROUP_ID == groupObject._resourceID,
</del><ins>+            Where=aboMembers.GROUP_ID == group1Object._resourceID,
</ins><span class="cx">         ).on(self.transactionUnderTest())
</span><ins>+        self.assertEqual(len(group1Rows), 6)  # 2 members x 3 revisions each
</ins><span class="cx"> 
</span><del>-        print(&quot;test_addressbookMembersRevisions groupRows= %s&quot; % (groupRows,))
-
-        group1vCard = VCard.fromString(group1Empty.replace(&quot;\n&quot;, &quot;\r\n&quot;))
-        yield groupObject.setComponent(group1vCard)
-        self.commit()
-
-        #normalAB = yield self.addressbookUnderTest(home=&quot;user01&quot;, name=&quot;addressbook&quot;)
-        groupObject = yield self.addressbookObjectUnderTest(self.transactionUnderTest(), name=&quot;group1.vcf&quot;, addressbook_name=&quot;addressbook&quot;, home=&quot;user01&quot;)
-        print(&quot;test_addressbookMembersRevisions sharedGroupObject= %s&quot; % (groupObject,))
-
-        # Get revisions
-        # get groups where this object was once a member and version info
-        aboMembers = schema.ABO_MEMBERS
-        groupRows = yield Select(
-            [aboMembers.MEMBER_ID,
</del><ins>+        # Get group2 revisions
+        group2Rows = yield Select(
+            [aboMembers.GROUP_ID,
+             aboMembers.MEMBER_ID,
</ins><span class="cx">              aboMembers.REMOVED,
</span><span class="cx">              aboMembers.REVISION],
</span><span class="cx">             From=aboMembers,
</span><del>-            Where=aboMembers.GROUP_ID == groupObject._resourceID,
</del><ins>+            Where=aboMembers.GROUP_ID == group2Object._resourceID,
</ins><span class="cx">         ).on(self.transactionUnderTest())
</span><ins>+        self.assertEqual(len(group2Rows), 4)  # 2 members x 2 revisions each
</ins><span class="cx"> 
</span><del>-        print(&quot;test_addressbookMembersRevisions groupRows= %s&quot; % (groupRows,))
-
-        normalAB = yield self.addressbookUnderTest(home=&quot;user01&quot;, name=&quot;addressbook&quot;)
-        self.assertEqual(normalAB._bindRevision, 0)
-        otherAB = yield self.addressbookUnderTest(home=&quot;user02&quot;, name=&quot;user01&quot;)
-        self.assertNotEqual(otherAB._bindRevision, 0)
-
-        changed, deleted, invalid = yield otherAB.resourceNamesSinceRevision(otherAB._bindRevision)
-        print(&quot;test_addressbookMembersRevisions changed=%s deleted=%s&quot; % (changed, deleted,))
-        self.assertEqual(changed, [&quot;group1.vcf&quot;])
-        self.assertEqual(len(deleted), 0)
-        self.assertEqual(len(invalid), 0)
-
-        otherHome = yield self.addressbookHomeUnderTest(name=&quot;user02&quot;)
-        for depth, result in (
-            (&quot;1&quot;, ['user01/', ]
-            ),
-            (&quot;infinity&quot;, ['user01/',
-                          'user01/group1.vcf']
-             )):
-            changed, deleted, invalid = yield otherAB.viewerHome().resourceNamesSinceRevision(otherAB._bindRevision, depth)
-            print(&quot;test_addressbookMembersRevisions depth=%s, changed=%s deleted=%s&quot; % (depth, changed, deleted,))
-            self.assertEqual(set(changed), set(result))
-            self.assertEqual(len(deleted), 0)
-            self.assertEqual(len(invalid), 0)
-
-        yield self.commit()
-
</del><span class="cx">         # Get the minimum valid revision
</span><span class="cx">         cs = schema.CALENDARSERVER
</span><span class="cx">         minValidRevision = int((yield Select(
</span><span class="lines">@@ -343,27 +224,48 @@
</span><span class="cx">             From=cs,
</span><span class="cx">             Where=(cs.NAME == &quot;MIN-VALID-REVISION&quot;)
</span><span class="cx">         ).on(self.transactionUnderTest()))[0][0])
</span><del>-        print(&quot;test_addressbookMembersRevisions minValidRevision= %s&quot; % (minValidRevision,))
</del><span class="cx">         self.assertEqual(minValidRevision, 1)
</span><span class="cx"> 
</span><del>-        # queue work items
</del><ins>+        # do FindMinValidRevisionWork
</ins><span class="cx">         wp = yield self.transactionUnderTest().enqueue(FindMinValidRevisionWork, notBefore=datetime.datetime.utcnow())
</span><del>-
</del><span class="cx">         yield self.commit()
</span><del>-
-        # Wait for it to complete
</del><span class="cx">         yield wp.whenExecuted()
</span><span class="cx"> 
</span><del>-        # Get the minimum valid revision again
</del><ins>+        # Get the minimum valid revision and check it
</ins><span class="cx">         cs = schema.CALENDARSERVER
</span><span class="cx">         minValidRevision = int((yield Select(
</span><span class="cx">             [cs.VALUE],
</span><span class="cx">             From=cs,
</span><span class="cx">             Where=(cs.NAME == &quot;MIN-VALID-REVISION&quot;)
</span><span class="cx">         ).on(self.transactionUnderTest()))[0][0])
</span><del>-        print(&quot;test_addressbookMembersRevisions minValidRevision= %s&quot; % (minValidRevision,))
-        self.assertNotEqual(minValidRevision, 1)
</del><ins>+        self.assertEqual(minValidRevision, max([row[3] for row in group1Rows + group2Rows]))
</ins><span class="cx"> 
</span><del>-        otherHome = yield self.addressbookHomeUnderTest(name=&quot;user02&quot;)
-        for depth in (&quot;1&quot;, &quot;infinity&quot;,):
-            self.failUnlessFailure(otherHome.resourceNamesSinceRevision(otherAB._bindRevision, depth), SyncTokenValidException)
</del><ins>+        # old sync token fails
+        addressbook = yield self.addressbookUnderTest(home=&quot;user01&quot;, name=&quot;addressbook&quot;)
+        self.failUnlessFailure(addressbook.resourceNamesSinceToken(token), SyncTokenValidException)
+
+        # do RevisionCleanupWork
+        wp = yield self.transactionUnderTest().enqueue(RevisionCleanupWork, notBefore=datetime.datetime.utcnow())
+        yield self.commit()
+        yield wp.whenExecuted()
+
+        group1Rows = yield Select(
+            [aboMembers.GROUP_ID,
+             aboMembers.MEMBER_ID,
+             aboMembers.REMOVED,
+             aboMembers.REVISION],
+            From=aboMembers,
+            Where=aboMembers.GROUP_ID == group1Object._resourceID,
+        ).on(self.transactionUnderTest())
+        self.assertEqual(len(group1Rows), 2)  # 2 members x 1 revision each
+        self.assertTrue(max([row[3] for row in group1Rows]) &lt; minValidRevision) # &lt; min revision but still around
+
+        group2Rows = yield Select(
+            [aboMembers.GROUP_ID,
+             aboMembers.MEMBER_ID,
+             aboMembers.REMOVED,
+             aboMembers.REVISION],
+            From=aboMembers,
+            Where=aboMembers.GROUP_ID == group2Object._resourceID,
+        ).on(self.transactionUnderTest())
+        self.assertEqual(len(group2Rows), 0)  # 0 members
</ins></span></pre>
</div>
</div>

</body>
</html>