<!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>[12329] CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py</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/12329">12329</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-01-13 14:58:49 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>test_addressbookObjectRevisions works</pre>
<h3>Modified Paths</h3>
<ul>
<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="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworktesttest_revision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py (12328 => 12329)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py 2014-01-13 22:56:21 UTC (rev 12328)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py 2014-01-13 22:58:49 UTC (rev 12329)
</span><span class="lines">@@ -176,14 +176,66 @@
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def test_addressbookObjectRevisions(self):
</span><del>- pass
</del><ins>+ """
+ Verify that all extra addressbook object revisions are deleted by the cleaning work items
+ """
</ins><span class="cx">
</span><ins>+ # get sync token
+ addressbook = yield self.addressbookUnderTest(home="user01", name="addressbook")
+ token = yield addressbook.syncToken()
</ins><span class="cx">
</span><ins>+ #make changes
+ card1Object = yield self.addressbookObjectUnderTest(self.transactionUnderTest(), name="card1.vcf", addressbook_name="addressbook", home="user01")
+ yield card1Object.remove()
+ card2Object = yield self.addressbookObjectUnderTest(self.transactionUnderTest(), name="card2.vcf", addressbook_name="addressbook", home="user01")
+ yield card2Object.remove()
+
+ # Get object revisions
+ rev = schema.ADDRESSBOOK_OBJECT_REVISIONS
+ revisionRows = yield Select(
+ [rev.REVISION],
+ From=rev,
+ ).on(self.transactionUnderTest())
+ self.assertNotEqual(len(revisionRows), 0)
+
+ # do FindMinValidRevisionWork
+ wp = yield self.transactionUnderTest().enqueue(FindMinValidRevisionWork, notBefore=datetime.datetime.utcnow())
+ yield self.commit()
+ yield wp.whenExecuted()
+
+ # Get the minimum valid revision and check it
+ cs = schema.CALENDARSERVER
+ minValidRevision = int((yield Select(
+ [cs.VALUE],
+ From=cs,
+ Where=(cs.NAME == "MIN-VALID-REVISION")
+ ).on(self.transactionUnderTest()))[0][0])
+ self.assertEqual(minValidRevision, max([row[0] for row in revisionRows]))
+
+ # do RevisionCleanupWork
+ wp = yield self.transactionUnderTest().enqueue(RevisionCleanupWork, notBefore=datetime.datetime.utcnow())
+ yield self.commit()
+ yield wp.whenExecuted()
+
+ # Get group1 object revision
+ rev = schema.ADDRESSBOOK_OBJECT_REVISIONS
+ revisionRows = yield Select(
+ [rev.REVISION],
+ From=rev,
+ ).on(self.transactionUnderTest())
+ self.assertEqual(len(revisionRows), 1) # current algo leaves 1 revision behind TOTAL, so what?
+
+ # old sync token fails
+ addressbook = yield self.addressbookUnderTest(home="user01", name="addressbook")
+ self.failUnlessFailure(addressbook.resourceNamesSinceToken(token), SyncTokenValidException)
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_addressbookMembersRevisions(self):
</span><span class="cx"> """
</span><del>- Verify that resourceNamesSinceRevision returns all resources after initial bind and sync.
</del><ins>+ Verify that all extra members revisions are deleted by the cleaning work items
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # get sync token
</span><span class="lines">@@ -198,7 +250,7 @@
</span><span class="cx"> yield group1Object.setComponent(VCard.fromString(self.group1))
</span><span class="cx"> self.commit()
</span><span class="cx">
</span><del>- # generate 2 revisions per member of group2, and make max revision of group1 members < max revision used
</del><ins>+ # generate 2 revisions per member of group2, and make max revision of group1 members < max valid revision
</ins><span class="cx"> group2Object = yield self.addressbookObjectUnderTest(self.transactionUnderTest(), name="group2.vcf", addressbook_name="addressbook", home="user01")
</span><span class="cx"> yield group2Object.setComponent(VCard.fromString(self.group2Empty))
</span><span class="cx"> self.commit()
</span><span class="lines">@@ -249,10 +301,6 @@
</span><span class="cx"> ).on(self.transactionUnderTest()))[0][0])
</span><span class="cx"> self.assertEqual(minValidRevision, max([row[3] for row in group1Rows + group2Rows]))
</span><span class="cx">
</span><del>- # old sync token fails
- addressbook = yield self.addressbookUnderTest(home="user01", name="addressbook")
- self.failUnlessFailure(addressbook.resourceNamesSinceToken(token), SyncTokenValidException)
-
</del><span class="cx"> # do RevisionCleanupWork
</span><span class="cx"> wp = yield self.transactionUnderTest().enqueue(RevisionCleanupWork, notBefore=datetime.datetime.utcnow())
</span><span class="cx"> yield self.commit()
</span><span class="lines">@@ -278,3 +326,7 @@
</span><span class="cx"> Where=aboMembers.GROUP_ID == group2Object._resourceID,
</span><span class="cx"> ).on(self.transactionUnderTest())
</span><span class="cx"> self.assertEqual(len(group2Rows), 0) # 0 members
</span><ins>+
+ # old sync token fails
+ addressbook = yield self.addressbookUnderTest(home="user01", name="addressbook")
+ self.failUnlessFailure(addressbook.resourceNamesSinceToken(token), SyncTokenValidException)
</ins></span></pre>
</div>
</div>
</body>
</html>