<!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>[12334] 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/12334">12334</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-01-13 22:37:24 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix test_notificationObjectRevisions</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 (12333 => 12334)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py        2014-01-14 06:07:17 UTC (rev 12333)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py        2014-01-14 06:37:24 UTC (rev 12334)
</span><span class="lines">@@ -19,12 +19,12 @@
</span><span class="cx"> from twext.enterprise.dal.syntax import Select
</span><span class="cx"> from twext.enterprise.queue import WorkItem
</span><span class="cx"> from twext.python.clsprop import classproperty
</span><del>-from twisted.internet.defer import inlineCallbacks
</del><ins>+from twisted.internet.defer import inlineCallbacks, returnValue
</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><span class="cx"> from txdav.caldav.datastore.test.util import buildCalendarStore
</span><del>-from txdav.common.datastore.sql_tables import schema
</del><ins>+from txdav.common.datastore.sql_tables import schema, _BIND_MODE_READ
</ins><span class="cx"> from txdav.common.datastore.test.util import CommonCommonTests, populateCalendarsFrom
</span><span class="cx"> from txdav.common.datastore.work.revision_cleanup import FindMinValidRevisionWork, RevisionCleanupWork
</span><span class="cx"> from txdav.common.icommondatastore import SyncTokenValidException
</span><span class="lines">@@ -226,6 +226,12 @@
</span><span class="cx"> "inbox": {
</span><span class="cx"> },
</span><span class="cx"> },
</span><ins>+ "user02": {
+ "calendar": {
+ },
+ "inbox": {
+ },
+ },
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -238,9 +244,29 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def _createCalendarShare(self):
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 0)
+
+ shareeView = yield calendar.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ inviteUID = shareeView.shareUID()
+ yield self.commit()
+
+ # Accept
+ shareeHome = yield self.homeUnderTest(name="user02")
+ shareeView = yield shareeHome.acceptShare(inviteUID)
+ sharedName = shareeView.name()
+ yield self.commit()
+
+ returnValue(sharedName)
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_calendarObjectRevisions(self):
</span><span class="cx"> """
</span><del>- Verify that all extra addressbook object revisions are deleted by the cleaning work items
</del><ins>+ Verify that all extra calendar object revisions are deleted by FindMinValidRevisionWork and RevisionCleanupWork
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # get sync token
</span><span class="lines">@@ -293,14 +319,64 @@
</span><span class="cx"> self.failUnlessFailure(calendar.resourceNamesSinceToken(token), SyncTokenValidException)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def test_notificationObjectRevisions(self):
</span><del>- pass
</del><ins>+ """
+ Verify that all extra notification object revisions are deleted by FindMinValidRevisionWork and RevisionCleanupWork
+ """
</ins><span class="cx">
</span><ins>+ # get sync token
+ home = yield self.homeUnderTest(name="user01")
+ token = yield home.syncToken()
</ins><span class="cx">
</span><ins>+ #make notification changes as side effect of sharing
+ yield self._createCalendarShare()
+
+ # Get object revisions
+ rev = schema.NOTIFICATION_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.NOTIFICATION_OBJECT_REVISIONS
+ revisionRows = yield Select(
+ [rev.REVISION],
+ From=rev,
+ ).on(self.transactionUnderTest())
+ self.assertEqual(len(revisionRows), 1) # deleteRevisionsBefore() leaves 1 revision behind
+
+ # old sync token fails
+ home = yield self.homeUnderTest(name="user01")
+ self.failUnlessFailure(home.resourceNamesSinceToken(token, "1"), SyncTokenValidException)
+ self.failUnlessFailure(home.resourceNamesSinceToken(token, "infinity"), SyncTokenValidException)
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_addressbookObjectRevisions(self):
</span><span class="cx"> """
</span><del>- Verify that all extra addressbook object revisions are deleted by the cleaning work items
</del><ins>+ Verify that all extra addressbook object revisions are deleted by FindMinValidRevisionWork and RevisionCleanupWork
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # get sync token
</span><span class="lines">@@ -356,7 +432,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_addressbookMembersRevisions(self):
</span><span class="cx"> """
</span><del>- Verify that all extra members revisions are deleted by the cleaning work items
</del><ins>+ Verify that all extra members revisions are deleted by FindMinValidRevisionWork and RevisionCleanupWork
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # get sync token
</span></span></pre>
</div>
</div>
</body>
</html>