<!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>[14468] CalendarServer/branches/users/sagen/trashcan-4/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/14468">14468</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-02-23 13:25:17 -0800 (Mon, 23 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Objects in trash were still appearing in original collection via listObjectResources()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagentrashcan4txdavcaldavdatastoresqlpy">CalendarServer/branches/users/sagen/trashcan-4/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan4txdavcommondatastoresqlpy">CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan4txdavcommondatastoresql_schemacurrentsql">CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/sql_schema/current.sql</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan4txdavcommondatastoretesttest_sqlpy">CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/test/test_sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagentrashcan4txdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-4/txdav/caldav/datastore/sql.py (14467 => 14468)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-4/txdav/caldav/datastore/sql.py 2015-02-23 18:03:06 UTC (rev 14467)
+++ CalendarServer/branches/users/sagen/trashcan-4/txdav/caldav/datastore/sql.py 2015-02-23 21:25:17 UTC (rev 14468)
</span><span class="lines">@@ -2361,6 +2361,8 @@
</span><span class="cx"> obj.CREATED,
</span><span class="cx"> obj.MODIFIED,
</span><span class="cx"> obj.DATAVERSION,
</span><ins>+ obj.TRASHED,
+ obj.IS_TRASH,
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -2382,6 +2384,8 @@
</span><span class="cx"> "_created",
</span><span class="cx"> "_modified",
</span><span class="cx"> "_dataversion",
</span><ins>+ "_trashed",
+ "_is_trash",
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan4txdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/sql.py (14467 => 14468)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/sql.py 2015-02-23 18:03:06 UTC (rev 14467)
+++ CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/sql.py 2015-02-23 21:25:17 UTC (rev 14468)
</span><span class="lines">@@ -7015,7 +7015,7 @@
</span><span class="cx"> rows = yield Select(
</span><span class="cx"> [obj.RESOURCE_NAME],
</span><span class="cx"> From=obj,
</span><del>- Where=obj.PARENT_RESOURCE_ID == Parameter('parentID')
</del><ins>+ Where=(obj.PARENT_RESOURCE_ID == Parameter('parentID')).And(obj.IS_TRASH == False)
</ins><span class="cx"> ).on(parent._txn, parentID=parent.id())
</span><span class="cx"> returnValue(sorted([row[0] for row in rows]))
</span><span class="cx">
</span><span class="lines">@@ -7498,7 +7498,7 @@
</span><span class="cx"> def _updateIsTrashQuery(cls):
</span><span class="cx"> obj = cls._objectSchema
</span><span class="cx"> return Update(
</span><del>- {obj.IS_TRASH: Parameter("isTrash")},
</del><ins>+ {obj.IS_TRASH: Parameter("isTrash"), obj.TRASHED: Parameter("trashed")},
</ins><span class="cx"> Where=obj.RESOURCE_ID == Parameter("resourceID"),
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -7506,7 +7506,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def toTrash(self):
</span><span class="cx"> yield self._updateIsTrashQuery.on(
</span><del>- self._txn, isTrash=True, resourceID=self._resourceID
</del><ins>+ self._txn, isTrash=True, trashed=datetime.datetime.utcnow(), resourceID=self._resourceID
</ins><span class="cx"> )
</span><span class="cx"> yield self._parentCollection.removedObjectResource(self)
</span><span class="cx"> yield self._parentCollection._deleteRevision(self.name())
</span><span class="lines">@@ -7526,7 +7526,7 @@
</span><span class="cx"> trash = self._parentCollection
</span><span class="cx"> self._parentCollection = yield trash.originalParentForResource(self)
</span><span class="cx"> yield self._updateIsTrashQuery.on(
</span><del>- self._txn, isTrash=False, resourceID=self._resourceID
</del><ins>+ self._txn, isTrash=False, trashed=None, resourceID=self._resourceID
</ins><span class="cx"> )
</span><span class="cx"> yield trash._deleteRevision(
</span><span class="cx"> trash.nameForResource(
</span><span class="lines">@@ -7544,7 +7544,7 @@
</span><span class="cx"> @classproperty
</span><span class="cx"> def _selectIsTrashQuery(cls):
</span><span class="cx"> obj = cls._objectSchema
</span><del>- return Select((obj.IS_TRASH,), From=obj, Where=obj.RESOURCE_ID == Parameter("resourceID"))
</del><ins>+ return Select((obj.IS_TRASH, obj.TRASHED), From=obj, Where=obj.RESOURCE_ID == Parameter("resourceID"))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -7557,7 +7557,17 @@
</span><span class="cx"> )[0][0]
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def whenTrashed(self):
+ returnValue(
+ (
+ yield self._selectIsTrashQuery.on(
+ self._txn, resourceID=self._resourceID
+ )
+ )[0][1]
+ )
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def removeNotifyCategory(self):
</span><span class="cx"> """
</span><span class="cx"> Indicates what category to use when determining the priority of push
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan4txdavcommondatastoresql_schemacurrentsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/sql_schema/current.sql (14467 => 14468)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/sql_schema/current.sql 2015-02-23 18:03:06 UTC (rev 14467)
+++ CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/sql_schema/current.sql 2015-02-23 21:25:17 UTC (rev 14468)
</span><span class="lines">@@ -133,7 +133,8 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> CHILD_TYPE varchar(10) default null, -- None, inbox, trash (FIXME: convert this to enumeration)
</span><del>- IS_TRASH boolean default false not null -- collection is in the trash
</del><ins>+ TRASHED timestamp default null,
+ IS_TRASH boolean default false not null -- collection is in the trash
</ins><span class="cx">
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -261,6 +262,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> DATAVERSION integer default 0 not null,
</span><ins>+ TRASHED timestamp default null,
</ins><span class="cx"> IS_TRASH boolean default false not null, -- entire resource is in the trash
</span><span class="cx">
</span><span class="cx"> unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</span><span class="lines">@@ -482,6 +484,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> DATAVERSION integer default 0 not null,
</span><ins>+ TRASHED timestamp default null,
</ins><span class="cx"> IS_TRASH boolean default false not null,
</span><span class="cx">
</span><span class="cx"> unique (ADDRESSBOOK_HOME_RESOURCE_ID, RESOURCE_NAME), -- implicit index
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan4txdavcommondatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/test/test_sql.py (14467 => 14468)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/test/test_sql.py 2015-02-23 18:03:06 UTC (rev 14467)
+++ CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/test/test_sql.py 2015-02-23 21:25:17 UTC (rev 14468)
</span><span class="lines">@@ -633,37 +633,59 @@
</span><span class="cx">
</span><span class="cx"> # Verify it's not in the trash
</span><span class="cx"> self.assertFalse((yield resource.isTrash()))
</span><ins>+ trashed = yield resource.whenTrashed()
+ self.assertTrue(trashed is None)
</ins><span class="cx">
</span><span class="cx"> # Move object to trash
</span><span class="cx"> yield resource.toTrash()
</span><span class="cx">
</span><ins>+ yield txn.commit()
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ txn = self.store.newTransaction()
+
</ins><span class="cx"> # Verify it's in the trash
</span><ins>+ resource = yield self._getResource(txn, "user01", "trash", "")
</ins><span class="cx"> self.assertTrue((yield resource.isTrash()))
</span><ins>+ trashed = yield resource.whenTrashed()
+ self.assertFalse(trashed is None)
</ins><span class="cx">
</span><span class="cx"> # No objects in collection
</span><del>- objects = yield collection.listObjectResources()
- self.assertEquals(len(objects), 0)
</del><ins>+ resourceNames = yield self._getResourceNames(txn, "user01", "calendar")
+ self.assertEqual(len(resourceNames), 0)
</ins><span class="cx">
</span><span class="cx"> # One object in trash
</span><del>- objects = yield trash.listObjectResources()
- self.assertEquals(len(objects), 1)
</del><ins>+ resourceNames = yield self._getResourceNames(txn, "user01", "trash")
+ self.assertEqual(len(resourceNames), 1)
</ins><span class="cx">
</span><span class="cx"> # Put back from trash
</span><del>- resource = yield self._getResource(txn, "user01", "trash", objects[0])
</del><span class="cx"> yield resource.fromTrash()
</span><span class="cx">
</span><ins>+ yield txn.commit()
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ txn = self.store.newTransaction()
+
</ins><span class="cx"> # Not in trash
</span><del>- self.assertFalse((yield resource.isTrash()))
</del><ins>+ resource = yield self._getResource(txn, "user01", "trash", "")
+ self.assertTrue(resource is None)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> # One object in collection
</span><del>- objects = yield collection.listObjectResources()
- self.assertEquals(len(objects), 1)
</del><ins>+ resourceNames = yield self._getResourceNames(txn, "user01", "calendar")
+ self.assertEqual(len(resourceNames), 1)
+ resource = yield self._getResource(txn, "user01", "calendar", "test.ics")
+ self.assertFalse((yield resource.isTrash()))
+ trashed = yield resource.whenTrashed()
+ self.assertTrue(trashed is None)
</ins><span class="cx">
</span><span class="cx"> # No objects in trash
</span><del>- objects = yield trash.listObjectResources()
- self.assertEquals(len(objects), 0)
</del><ins>+ resourceNames = yield self._getResourceNames(txn, "user01", "trash")
+ self.assertEqual(len(resourceNames), 0)
</ins><span class="cx">
</span><ins>+ yield txn.commit()
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> # Not implemented
</span><span class="cx"> # #
</span><span class="cx"> # # Now with addressbook
</span><span class="lines">@@ -809,6 +831,8 @@
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx"> resourceNames = yield self._getResourceNames(txn, "user01", "inbox")
</span><span class="cx"> self.assertEqual(len(resourceNames), 1)
</span><ins>+ resource = yield self._getResource(txn, "user01", "inbox", "")
+ yield resource.remove()
</ins><span class="cx">
</span><span class="cx"> # user01's copy has SCHEDULE-STATUS update
</span><span class="cx"> data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
</span><span class="lines">@@ -829,6 +853,10 @@
</span><span class="cx">
</span><span class="cx"> # user01's copy is in the trash, still with user02 accepted
</span><span class="cx"> txn = self.store.newTransaction()
</span><ins>+ resource = yield self._getResource(txn, "user01", "trash", "")
+ self.assertTrue((yield resource.isTrash()))
+ trashed = yield resource.whenTrashed()
+ self.assertFalse(trashed is None)
</ins><span class="cx"> data = yield self._getResourceData(txn, "user01", "trash", "")
</span><span class="cx"> self.assertTrue("PARTSTAT=ACCEPTED" in data)
</span><span class="cx"> yield txn.commit()
</span><span class="lines">@@ -859,6 +887,10 @@
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx">
</span><span class="cx"> # user01's copy should be back on their calendar
</span><ins>+ resource = yield self._getResource(txn, "user01", "calendar", "test.ics")
+ self.assertFalse((yield resource.isTrash()))
+ trashed = yield resource.whenTrashed()
+ self.assertTrue(trashed is None)
</ins><span class="cx"> data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
</span><span class="cx"> self.assertTrue("PARTSTAT=NEEDS-ACTION" in data)
</span><span class="cx">
</span><span class="lines">@@ -871,6 +903,138 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_trashScheduledFullyInFutureAttendeeRemove(self):
+
+ from twistedcaldav.stdconfig import config
+ self.patch(config, "EnableTrashCollection", True)
+
+ # A month in the future
+ start = DateTime.getNowUTC()
+ start.setHHMMSS(0, 0, 0)
+ start.offsetMonth(1)
+ end = DateTime.getNowUTC()
+ end.setHHMMSS(1, 0, 0)
+ end.offsetMonth(1)
+ subs = {
+ "start": start,
+ "end": end,
+ }
+
+ data1 = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890-attendee-reply
+DTSTART;TZID=America/Los_Angeles:%(start)s
+DTEND;TZID=America/Los_Angeles:%(end)s
+DTSTAMP:20150204T192546Z
+SUMMARY:Scheduled
+ORGANIZER;CN="User 01":mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""" % subs
+
+ data2 = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890-attendee-reply
+DTSTART;TZID=America/Los_Angeles:%(start)s
+DTEND;TZID=America/Los_Angeles:%(end)s
+DTSTAMP:20150204T192546Z
+SUMMARY:Scheduled
+ORGANIZER;CN="User 01":mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""" % subs
+
+ # user01 invites user02
+ txn = self.store.newTransaction()
+ yield self._createResource(
+ txn, "user01", "calendar", "test.ics", data1
+ )
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01's copy has SCHEDULE-STATUS update
+ txn = self.store.newTransaction()
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("SCHEDULE-STATUS=1.2" in data)
+
+ # user02 has an inbox item
+ resourceNames = yield self._getResourceNames(txn, "user02", "inbox")
+ self.assertEqual(len(resourceNames), 1)
+
+ # user02 accepts
+ yield self._updateResource(txn, "user02", "calendar", "", data2)
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01 has an inbox item
+ txn = self.store.newTransaction()
+ resourceNames = yield self._getResourceNames(txn, "user01", "inbox")
+ self.assertEqual(len(resourceNames), 1)
+ resource = yield self._getResource(txn, "user01", "inbox", "")
+ yield resource.remove()
+
+ # user01's copy has SCHEDULE-STATUS update
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("SCHEDULE-STATUS=2.0" in data)
+ self.assertTrue("PARTSTAT=ACCEPTED" in data)
+
+ resource = yield self._getResource(txn, "user02", "inbox", "")
+ yield resource.remove()
+
+ yield txn.commit()
+
+ # user02 trashes event
+ txn = self.store.newTransaction()
+ resource = yield self._getResource(txn, "user02", "calendar", "")
+ yield resource.remove()
+
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01's calendar copy shows user02 declined
+ txn = self.store.newTransaction()
+
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("PARTSTAT=DECLINED" in data)
+
+ # user01's inbox copy also shows user02 declined
+ data = yield self._getResourceData(txn, "user01", "inbox", "")
+ self.assertTrue("PARTSTAT=DECLINED" in data)
+ resource = yield self._getResource(txn, "user01", "inbox", "")
+ yield resource.remove()
+
+ # result = yield txn.execSQL("select * from calendar_object", [])
+ # for row in result:
+ # print("ROW", row)
+
+ # user02's copy is in the trash only, and still has ACCEPTED
+ resourceNames = yield self._getResourceNames(txn, "user02", "trash")
+ self.assertEqual(len(resourceNames), 1)
+
+ resourceNames = yield self._getResourceNames(txn, "user02", "calendar")
+ self.assertEqual(len(resourceNames), 0)
+
+ resourceNames = yield self._getResourceNames(txn, "user02", "inbox")
+ self.assertEqual(len(resourceNames), 0)
+
+ data = yield self._getResourceData(txn, "user02", "trash", "")
+ self.assertTrue("PARTSTAT=ACCEPTED" in data)
+
+ yield txn.commit()
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_trashScheduledFullyInPast(self):
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.stdconfig import config
</span></span></pre>
</div>
</div>
</body>
</html>