[CalendarServer-changes] [14973] CalendarServer/branches/release/CalendarServer-5.4-dev
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jul 16 11:49:23 PDT 2015
Revision: 14973
http://trac.calendarserver.org//changeset/14973
Author: cdaboo at apple.com
Date: 2015-07-16 11:49:23 -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/branches/release/CalendarServer-5.4-dev/twistedcaldav/datafilters/peruserdata.py
CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/processing.py
CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/sql.py
CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/test/test_attachments.py
CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/test/test_sql.py
CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/common/datastore/test/util.py
Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav/datafilters/peruserdata.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav/datafilters/peruserdata.py 2015-07-16 18:48:30 UTC (rev 14972)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav/datafilters/peruserdata.py 2015-07-16 18:49:23 UTC (rev 14973)
@@ -275,7 +275,7 @@
if master_perinstance:
peruser_component.addComponent(master_perinstance)
peruser_component_different = True
- for rid, perinstance in perinstance_components.iteritems():
+ for rid, perinstance in sorted(perinstance_components.iteritems(), key=lambda x: x[0]):
if rid is None:
continue
if master_perinstance is None or perinstance != master_perinstance:
Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/processing.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/processing.py 2015-07-16 18:48:30 UTC (rev 14972)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/processing.py 2015-07-16 18:49:23 UTC (rev 14973)
@@ -484,7 +484,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/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/sql.py 2015-07-16 18:48:30 UTC (rev 14972)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/sql.py 2015-07-16 18:49:23 UTC (rev 14973)
@@ -1506,7 +1506,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
@@ -3570,6 +3570,7 @@
olderResourceName,
calendar_old,
ComponentUpdateState.SPLIT_OWNER,
+ options={"dropboxID": olderUID},
split_details=(rid, newerUID, False,)
)
@@ -3602,7 +3603,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:
- yield self.calendar()._createCalendarObjectWithNameInternal("%s.ics" % (olderUID,), ical_old, ComponentUpdateState.SPLIT_ATTENDEE)
+ yield self.calendar()._createCalendarObjectWithNameInternal(
+ "%s.ics" % (olderUID,),
+ ical_old,
+ ComponentUpdateState.SPLIT_ATTENDEE,
+ options={"dropboxID": olderUID},
+ )
class CalendarObjectSplitterWork(WorkItem, fromTable(schema.CALENDAR_OBJECT_SPLITTER_WORK)):
Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/test/test_attachments.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/test/test_attachments.py 2015-07-16 18:48:30 UTC (rev 14972)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/test/test_attachments.py 2015-07-16 18:49:23 UTC (rev 14973)
@@ -1521,7 +1521,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
@@ -1699,7 +1699,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:
@@ -1737,7 +1737,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/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/test/test_sql.py 2015-07-16 18:48:30 UTC (rev 14972)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/test/test_sql.py 2015-07-16 18:49:23 UTC (rev 14973)
@@ -3791,6 +3791,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/branches/release/CalendarServer-5.4-dev/txdav/common/datastore/test/util.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/common/datastore/test/util.py 2015-07-16 18:48:30 UTC (rev 14972)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/common/datastore/test/util.py 2015-07-16 18:49:23 UTC (rev 14973)
@@ -260,7 +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/ee2f05da/attachment.html>
More information about the calendarserver-changes
mailing list