<!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>[14816] CalendarServer/trunk/txdav</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/14816">14816</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-21 22:52:18 -0700 (Thu, 21 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure hidden trash collection is not exposed in sync report results.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (14815 => 14816)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py        2015-05-22 00:07:30 UTC (rev 14815)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py        2015-05-22 05:52:18 UTC (rev 14816)
</span><span class="lines">@@ -2348,7 +2348,108 @@
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_homeSyncTokenWithTrash_Visible(self):
+ """
+ L{ICalendarHome.resourceNamesSinceToken} will return the names of
+ calendar objects created since L{ICalendarHome.syncToken} last returned
+ a particular value.
+ """
</ins><span class="cx">
</span><ins>+ self.patch(config, "EnableTrashCollection", True)
+ self.patch(config, "ExposeTrashCollection", True)
+
+ home = yield self.homeUnderTest()
+ cal = yield self.calendarUnderTest()
+ st = yield home.syncToken()
+ yield cal.createCalendarObjectWithName("new.ics", Component.fromString(
+ test_event_text
+ ))
+
+ obj1 = yield cal.calendarObjectWithName("2.ics")
+ yield obj1.remove()
+ yield home.createCalendarWithName("other-calendar")
+ st2 = yield home.syncToken()
+ self.failIfEquals(st, st2)
+
+ home = yield self.homeUnderTest()
+
+ expected = [
+ "calendar_1/",
+ "calendar_1/new.ics",
+ "calendar_1/2.ics",
+ "other-calendar/"
+ ]
+
+ trash = yield home.getTrash()
+ if trash is not None:
+ trashed = yield trash.calendarObjects()
+ expected.extend([
+ "{}/".format(trash.name()),
+ "{}/{}".format(trash.name(), trashed[0].name()),
+ ])
+
+ changed, deleted, invalid = yield home.resourceNamesSinceToken(
+ self.token2revision(st), "infinity")
+
+ self.assertEquals(set(changed), set(expected))
+ self.assertEquals(set(deleted), set(["calendar_1/2.ics"]))
+ self.assertEquals(invalid, [])
+
+ changed, deleted, invalid = yield home.resourceNamesSinceToken(
+ self.token2revision(st2), "infinity")
+ self.assertEquals(changed, [])
+ self.assertEquals(deleted, [])
+ self.assertEquals(invalid, [])
+
+
+ @inlineCallbacks
+ def test_homeSyncTokenWithTrash_Invisible(self):
+ """
+ L{ICalendarHome.resourceNamesSinceToken} will return the names of
+ calendar objects created since L{ICalendarHome.syncToken} last returned
+ a particular value.
+ """
+
+ self.patch(config, "EnableTrashCollection", True)
+
+ home = yield self.homeUnderTest()
+ cal = yield self.calendarUnderTest()
+ st = yield home.syncToken()
+ yield cal.createCalendarObjectWithName("new.ics", Component.fromString(
+ test_event_text
+ ))
+
+ obj1 = yield cal.calendarObjectWithName("2.ics")
+ yield obj1.remove()
+ yield home.createCalendarWithName("other-calendar")
+ st2 = yield home.syncToken()
+ self.failIfEquals(st, st2)
+
+ home = yield self.homeUnderTest()
+
+ expected = [
+ "calendar_1/",
+ "calendar_1/new.ics",
+ "calendar_1/2.ics",
+ "other-calendar/"
+ ]
+
+ changed, deleted, invalid = yield home.resourceNamesSinceToken(
+ self.token2revision(st), "infinity")
+
+ self.assertEquals(set(changed), set(expected))
+ self.assertEquals(set(deleted), set(["calendar_1/2.ics"]))
+ self.assertEquals(invalid, [])
+
+ changed, deleted, invalid = yield home.resourceNamesSinceToken(
+ self.token2revision(st2), "infinity")
+ self.assertEquals(changed, [])
+ self.assertEquals(deleted, [])
+ self.assertEquals(invalid, [])
+
+
+
</ins><span class="cx"> class SchedulingTests(CommonCommonTests, unittest.TestCase):
</span><span class="cx"> """
</span><span class="cx"> CalendarObject splitting tests
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (14815 => 14816)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py        2015-05-22 00:07:30 UTC (rev 14815)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py        2015-05-22 05:52:18 UTC (rev 14816)
</span><span class="lines">@@ -2610,11 +2610,22 @@
</span><span class="cx"> (yield self.doChangesQuery(revision))
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+ if not config.ExposeTrashCollection:
+ trash = yield self.getTrash(create=False)
+ trashName = trash.name() if trash else None
+ else:
+ trashName = None
+
</ins><span class="cx"> changed = set()
</span><span class="cx"> deleted = set()
</span><span class="cx"> invalid = set()
</span><span class="cx"> deleted_collections = set()
</span><span class="cx"> for path, name, wasdeleted in results:
</span><ins>+
+ # Don't report the trash if it is hidden
+ if trashName and path == trashName:
+ continue
+
</ins><span class="cx"> if wasdeleted:
</span><span class="cx"> if name:
</span><span class="cx"> # Resource deleted - for depth "1" report collection as changed,
</span><span class="lines">@@ -3154,6 +3165,7 @@
</span><span class="cx"> yield collection.fromTrash(restoreChildren=True)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CommonHomeChild(FancyEqMixin, Memoizable, _SharedSyncLogic, HomeChildBase, SharingMixIn):
</span><span class="cx"> """
</span><span class="cx"> Common ancestor class of AddressBooks and Calendars.
</span></span></pre>
</div>
</div>
</body>
</html>