[CalendarServer-changes] [14972] CalendarServer/trunk/txdav
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jul 16 11:48:30 PDT 2015
Revision: 14972
http://trac.calendarserver.org//changeset/14972
Author: cdaboo at apple.com
Date: 2015-07-16 11:48:30 -0700 (Thu, 16 Jul 2015)
Log Message:
-----------
Make sure unit tests use the same dropbox template URI as we use in the real server.
Modified Paths:
--------------
CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py
CalendarServer/trunk/txdav/caldav/datastore/sql.py
CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py
CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py
CalendarServer/trunk/txdav/common/datastore/test/util.py
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2015-07-16 18:39:04 UTC (rev 14971)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2015-07-16 18:48:30 UTC (rev 14972)
@@ -413,7 +413,7 @@
log.debug("ImplicitProcessing - originator '%s' to recipient '%s' ignoring UID: '%s' - split already done" % (self.originator.cuaddr, self.recipient.cuaddr, self.uid))
returnValue((True, False, False, None,))
else:
- self.message.removeProperty("X-CALENDARSERVER-SPLIT-OLDER-UID")
+ self.message.removeProperty("X-CALENDARSERVER-SPLIT-NEWER-UID")
self.message.removeProperty("X-CALENDARSERVER-SPLIT-RID")
# Different based on method
Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-07-16 18:39:04 UTC (rev 14971)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-07-16 18:48:30 UTC (rev 14972)
@@ -2629,7 +2629,7 @@
self.scheduleTag = options.get("scheduleTag", "")
self.scheduleEtags = options.get("scheduleEtags", "")
self.hasPrivateComment = options.get("hasPrivateComment", False)
- self._dropboxID = None
+ self._dropboxID = options.get("dropboxID", None)
# Component caching
self._cachedComponent = None
@@ -5310,6 +5310,7 @@
olderResourceName,
calendar_old,
ComponentUpdateState.SPLIT_OWNER,
+ options={"dropboxID": olderUID},
split_details=(rid, newerUID, False, False)
)
@@ -5368,7 +5369,12 @@
# Create a new resource and store its data (but not if the parent is "inbox", or if it is empty)
if not self.calendar().isInbox() and ical_old.mainType() is not None:
- olderObject = yield self.calendar()._createCalendarObjectWithNameInternal("{0}.ics".format(olderUID,), ical_old, ComponentUpdateState.SPLIT_ATTENDEE)
+ olderObject = yield self.calendar()._createCalendarObjectWithNameInternal(
+ "{0}.ics".format(olderUID,),
+ ical_old,
+ ComponentUpdateState.SPLIT_ATTENDEE,
+ options={"dropboxID": olderUID},
+ )
# Reconcile trash state
if self.isInTrash():
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py 2015-07-16 18:39:04 UTC (rev 14971)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py 2015-07-16 18:48:30 UTC (rev 14972)
@@ -1689,7 +1689,7 @@
for attach in attachments:
if attach.hasParameter("MANAGED-ID"):
managed_count += 1
- self.assertTrue(attach.value().find("/dropbox/") == -1)
+ self.assertTrue(attach.value().find("/dropbox/") != -1)
self.assertTrue(attach.parameterValue("FILENAME") in filenames)
else:
dropbox_count += 1
@@ -1867,7 +1867,7 @@
for attach in attachments:
if attach.hasParameter("MANAGED-ID"):
managed_count += 1
- self.assertTrue(attach.value().find("1.2.dropbox") == -1)
+ self.assertTrue(attach.value().find("1.2.dropbox") != -1)
self.assertEqual(attach.parameterValue("MANAGED-ID"), mnew.managedID())
self.assertEqual(attach.parameterValue("FILENAME"), mnew.name())
else:
@@ -1905,7 +1905,7 @@
for attach in attachments:
if attach.hasParameter("MANAGED-ID"):
managed_count += 1
- self.assertTrue(attach.value().find("1.2.dropbox") == -1)
+ self.assertTrue(attach.value().find("1.2.dropbox") != -1)
self.assertTrue(attach.parameterValue("FILENAME") in ("attach_1_2_1.txt", "attach_1_2_2.txt"))
else:
dropbox_count += 1
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2015-07-16 18:39:04 UTC (rev 14971)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2015-07-16 18:48:30 UTC (rev 14972)
@@ -5355,6 +5355,7 @@
self.assertEqual(attachment.value(), location)
relsubs["past_mid"] = attachment.parameterValue("MANAGED-ID")
+ attachment = ical_past.masterComponent().getProperty("ATTACH")
relsubs["att_past_uri"] = attachment.value()
# Verify user01 data
Modified: CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py 2015-07-16 18:39:04 UTC (rev 14971)
+++ CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py 2015-07-16 18:48:30 UTC (rev 14972)
@@ -976,7 +976,7 @@
from txdav.caldav.datastore.sql_external import ManagedAttachmentExternal
self.assertTrue(isinstance(attachment, ManagedAttachmentExternal))
self.assertEqual(attachment.size(), len(data))
- self.assertTrue("user01/attachments/test" in location)
+ self.assertTrue("user01/dropbox/" in location)
yield self.commitTransaction(1)
cobjs = yield ManagedAttachment.referencesTo(self.theTransactionUnderTest(0), managedID)
@@ -1013,7 +1013,7 @@
from txdav.caldav.datastore.sql_external import ManagedAttachmentExternal
self.assertTrue(isinstance(attachment, ManagedAttachmentExternal))
self.assertEqual(attachment.size(), len(data))
- self.assertTrue("user01/attachments/test" in location)
+ self.assertTrue("user01/dropbox/" in location)
yield self.commitTransaction(1)
cobjs = yield ManagedAttachment.referencesTo(self.theTransactionUnderTest(0), managedID)
Modified: CalendarServer/trunk/txdav/common/datastore/test/util.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/test/util.py 2015-07-16 18:39:04 UTC (rev 14971)
+++ CalendarServer/trunk/txdav/common/datastore/test/util.py 2015-07-16 18:48:30 UTC (rev 14972)
@@ -260,10 +260,7 @@
{"push": notifierFactory} if notifierFactory is not None else {},
directoryService,
attachmentRoot,
- (
- "https://example.com/calendars/__uids__/"
- "%(home)s/attachments/%(name)s"
- ),
+ "https://example.com/calendars/__uids__/%(home)s/dropbox/%(dropbox_id)s/%(name)s",
quota=quota
)
store.label = currentTestID
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150716/9a41e51c/attachment-0001.html>
More information about the calendarserver-changes
mailing list