[CalendarServer-changes] [14649] CalendarServer/trunk/txdav/common/datastore/test/test_trash.py
source_changes at macosforge.org
source_changes at macosforge.org
Thu Apr 2 11:47:45 PDT 2015
Revision: 14649
http://trac.calendarserver.org//changeset/14649
Author: sagen at apple.com
Date: 2015-04-02 11:47:45 -0700 (Thu, 02 Apr 2015)
Log Message:
-----------
Fix trash test to not look at two different trash objects
Modified Paths:
--------------
CalendarServer/trunk/txdav/common/datastore/test/test_trash.py
Modified: CalendarServer/trunk/txdav/common/datastore/test/test_trash.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/test/test_trash.py 2015-04-02 16:37:22 UTC (rev 14648)
+++ CalendarServer/trunk/txdav/common/datastore/test/test_trash.py 2015-04-02 18:47:45 UTC (rev 14649)
@@ -75,6 +75,14 @@
@inlineCallbacks
+ def _getTrashNames(self, txn, userName):
+ home = yield txn.calendarHomeWithUID(userName)
+ trash = yield home.getTrash()
+ resourceNames = yield trash.listObjectResources()
+ returnValue(resourceNames)
+
+
+ @inlineCallbacks
def _updateResource(self, txn, userName, collectionName, resourceName, data):
resource = yield self._getResource(txn, userName, collectionName, resourceName)
yield resource.setComponent(Component.fromString(data))
@@ -2008,16 +2016,13 @@
txn = self.store.newTransaction()
resource = yield self._getResource(txn, "user01", "calendar", "test.ics")
yield resource.remove()
- home = yield self._homeForUser(txn, "user01")
- trash = yield home.getTrash()
- trashName = trash.name()
+ names = yield self._getTrashNames(txn, "user01")
+ self.assertEquals(len(names), 1)
yield txn.commit()
txn = self.store.newTransaction()
- names = yield self._getResourceNames(txn, "user01", trashName)
- self.assertEquals(len(names), 1)
yield emptyTrashForPrincipal(None, self.store, "user01", 0, txn=txn, verbose=False)
- names = yield self._getResourceNames(txn, "user01", trashName)
+ names = yield self._getTrashNames(txn, "user01")
self.assertEquals(len(names), 0)
result = yield txn.execSQL("select * from calendar_object", [])
self.assertEquals(len(result), 0)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150402/e0cea292/attachment.html>
More information about the calendarserver-changes
mailing list