<!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>[12274] CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work</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/12274">12274</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-01-08 15:27:54 -0800 (Wed, 08 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>clean names</pre>
<h3>Modified Paths</h3>
<ul>
<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="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworkrevision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py (12273 => 12274)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py 2014-01-08 22:20:19 UTC (rev 12273)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py 2014-01-08 23:27:54 UTC (rev 12274)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> # Schedule revision cleanup
</span><span class="cx"> log.debug("Scheduling revision cleanup now")
</span><del>- yield self.transaction.enqueue(RevisionCleanupWork)
</del><ins>+ yield self.transaction.enqueue(RevisionCleanupWork, notBefore=datetime.datetime.utcnow())
</ins><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> # Schedule next update
</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 (12273 => 12274)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py 2014-01-08 22:20:19 UTC (rev 12273)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py 2014-01-08 23:27:54 UTC (rev 12274)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> ##
</span><del>-# Copyright (c) 2010-2013 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2010-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> # you may not use this file except in compliance with the License.
</span><span class="lines">@@ -18,34 +18,27 @@
</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, succeed, returnValue, DeferredList
-from twisted.trial import unittest
</del><ins>+from twisted.internet.defer import inlineCallbacks, returnValue
</ins><span class="cx"> from twisted.trial.unittest import TestCase
</span><del>-from twistedcaldav import ical
</del><span class="cx"> from twistedcaldav.config import config
</span><del>-from twistedcaldav.ical import Component, normalize_iCalStr, diff_iCalStrs
</del><span class="cx"> from twistedcaldav.vcard import Component as VCard
</span><del>-from txdav.caldav.datastore.scheduling.caldav.scheduler import CalDAVScheduler
-from txdav.caldav.datastore.scheduling.itip import iTIPRequestStatus
-from txdav.caldav.datastore.scheduling.scheduler import ScheduleResponseQueue
-from txdav.caldav.datastore.test.util import buildCalendarStore
-from txdav.common.datastore.sql import ECALENDARTYPE
</del><span class="cx"> from txdav.common.datastore.sql_tables import schema, _BIND_MODE_READ
</span><del>-from txdav.common.datastore.test.util import buildStore, populateCalendarsFrom, CommonCommonTests
-from txweb2 import responsecode
</del><ins>+from txdav.common.datastore.test.util import buildStore, CommonCommonTests
</ins><span class="cx"> from txdav.common.datastore.work.revision_cleanup import FindMinValidRevisionWork
</span><ins>+import datetime
</ins><span class="cx">
</span><span class="cx">
</span><del>-class BaseSharingTests(CommonCommonTests, TestCase):
</del><ins>+class AddressBookSharedGroupRevisionCleanupTests(CommonCommonTests, TestCase):
</ins><span class="cx"> """
</span><span class="cx"> Test store-based address book sharing.
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def setUp(self):
</span><del>- yield super(BaseSharingTests, self).setUp()
</del><ins>+ yield super(AddressBookSharedGroupRevisionCleanupTests, self).setUp()
</ins><span class="cx"> self._sqlStore = yield buildStore(self, self.notifierFactory)
</span><span class="cx"> yield self.populate()
</span><ins>+ self.patch(config, "SyncTokenLifetimeDays", 0)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -207,18 +200,11 @@
</span><span class="cx"> returnValue(inviteUID)
</span><span class="cx">
</span><span class="cx">
</span><del>-
-class SharingRevisions(BaseSharingTests):
- """
- Test store-based sharing and interaction with revision table.
- """
-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_sharedRevisions(self):
</span><span class="cx"> """
</span><span class="cx"> Verify that resourceNamesSinceRevision returns all resources after initial bind and sync.
</span><span class="cx"> """
</span><del>-
</del><span class="cx"> yield self._createShare()
</span><span class="cx">
</span><span class="cx"> normalAB = yield self.addressbookUnderTest(home="user01", name="addressbook")
</span><span class="lines">@@ -234,6 +220,8 @@
</span><span class="cx"> self.assertEqual(len(changed), 0)
</span><span class="cx"> self.assertEqual(len(deleted), 0)
</span><span class="cx">
</span><ins>+ # TODO: Change the groups
+
</ins><span class="cx"> otherHome = yield self.addressbookHomeUnderTest(name="user02")
</span><span class="cx"> for depth in ("1", "infinity",):
</span><span class="cx"> changed, deleted = yield otherHome.resourceNamesSinceRevision(0, depth)
</span><span class="lines">@@ -244,26 +232,34 @@
</span><span class="cx"> self.assertEqual(len(changed), 0)
</span><span class="cx"> self.assertEqual(len(deleted), 0)
</span><span class="cx">
</span><del>- yield self.transactionUnderTest().enqueue(FindMinValidRevisionWork)
</del><ins>+ # Get the minimum valid revision
+ 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, 1)
</ins><span class="cx">
</span><del>- yield self.transactionUnderTest().commit()
</del><ins>+ # queue work items
+ work = yield self.transactionUnderTest().enqueue(FindMinValidRevisionWork, notBefore=datetime.datetime.utcnow())
</ins><span class="cx">
</span><del>- # now nuke the revisions
- w = schema.FIND_MIN_VALID_REVISION_WORK
- rows = yield Select(
- [w.WORK_ID, ],
- From=w
- ).on(self.transactionUnderTest())
- print("test_sharedRevisions FIND_MIN_VALID_REVISION_WORK rows=%s" % (rows,))
</del><ins>+ yield self.abort()
</ins><span class="cx">
</span><del>- w = schema.REVISION_CLEANUP_WORK
- rows = yield Select(
- [w.WORK_ID, ],
- From=w
- ).on(self.transactionUnderTest())
- print("test_sharedRevisions REVISION_CLEANUP_WORK rows=%s" % (rows,))
</del><ins>+ # Wait for it to complete
+ yield work.whenExecuted()
</ins><span class="cx">
</span><ins>+ # Get the minimum valid revision again
+ cs = schema.CALENDARSERVER
+ minValidRevision = int((yield Select(
+ [cs.VALUE],
+ From=cs,
+ Where=(cs.NAME == "MIN-VALID-REVISION")
+ ).on(self.transactionUnderTest()))[0][0])
+ print("test_sharedRevisions minValidRevision=%s" % (minValidRevision,))
+ self.assertNotEqual(minValidRevision, 1)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_sharedGroupRevisions(self):
</span><span class="cx"> """
</span><span class="lines">@@ -304,7 +300,7 @@
</span><span class="cx"> self.assertEqual(len(deleted), 0)
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><ins>+'''
</ins><span class="cx"> class CalendarObjectSplitting(CommonCommonTests, unittest.TestCase):
</span><span class="cx"> """
</span><span class="cx"> CalendarObject splitting tests
</span><span class="lines">@@ -765,3 +761,4 @@
</span><span class="cx"> self.assertEqual(details[1][0], "urn:uuid:user01")
</span><span class="cx"> self.assertEqual(details[1][1], ("mailto:cuser01@example.org",))
</span><span class="cx"> self.assertEqual(normalize_iCalStr(details[1][2]), normalize_iCalStr(data_past_external) % relsubs, "Failed past: %s\n%s" % (title, diff_iCalStrs(details[1][2], data_past_external % relsubs),))
</span><ins>+'''
</ins></span></pre>
</div>
</div>
</body>
</html>