[CalendarServer-changes] [14477] CalendarServer/branches/users/sagen/trashcan-5/txdav/common/ datastore/test/test_sql.py
source_changes at macosforge.org
source_changes at macosforge.org
Wed Feb 25 11:06:11 PST 2015
Revision: 14477
http://trac.calendarserver.org//changeset/14477
Author: sagen at apple.com
Date: 2015-02-25 11:06:11 -0800 (Wed, 25 Feb 2015)
Log Message:
-----------
Fix the unit test by clearing the right inbox
Modified Paths:
--------------
CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py
Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py
===================================================================
--- CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py 2015-02-25 03:35:13 UTC (rev 14476)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py 2015-02-25 19:06:11 UTC (rev 14477)
@@ -1476,6 +1476,10 @@
data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
self.assertTrue("SCHEDULE-STATUS=2.0" in data)
self.assertTrue("PARTSTAT=TENTATIVE" in data)
+
+ # clear the inbox items
+ resource = yield self._getResource(txn, "user01", "inbox", "")
+ yield resource.remove()
resource = yield self._getResource(txn, "user02", "inbox", "")
yield resource.remove()
@@ -1497,8 +1501,7 @@
# user01's inbox copy also shows user02 declined
data = yield self._getResourceData(txn, "user01", "inbox", "")
- print("user01 inbox after trash", data)
- self.assertTrue("PARTSTAT=DECLINED" in data) # FIXME -- this is not always true. Sometimes it shows PARTSTAT=TENTATIVE still, as if the implicit scheduling has not finished.
+ self.assertTrue("PARTSTAT=DECLINED" in data)
resource = yield self._getResource(txn, "user01", "inbox", "")
yield resource.remove()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150225/fe37234a/attachment.html>
More information about the calendarserver-changes
mailing list