<!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>[14973] CalendarServer/branches/release/CalendarServer-5.4-dev</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/14973">14973</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-16 11:49:23 -0700 (Thu, 16 Jul 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make sure unit tests use the same dropbox template URI as we use in the real server.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtwistedcaldavdatafiltersperuserdatapy">CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav/datafilters/peruserdata.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingprocessingpy">CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/processing.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoresqlpy">CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoretesttest_attachmentspy">CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/test/test_attachments.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoretesttest_sqlpy">CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/test/test_sql.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtxdavcommondatastoretestutilpy">CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/common/datastore/test/util.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer54devtwistedcaldavdatafiltersperuserdatapy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/twistedcaldav/datafilters/peruserdata.py (14972 => 14973)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx">             if master_perinstance:
</span><span class="cx">                 peruser_component.addComponent(master_perinstance)
</span><span class="cx">                 peruser_component_different = True
</span><del>-            for rid, perinstance in perinstance_components.iteritems():
</del><ins>+            for rid, perinstance in sorted(perinstance_components.iteritems(), key=lambda x: x[0]):
</ins><span class="cx">                 if rid is None:
</span><span class="cx">                     continue
</span><span class="cx">                 if master_perinstance is None or perinstance != master_perinstance:
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/processing.py (14972 => 14973)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx">                 log.debug(&quot;ImplicitProcessing - originator '%s' to recipient '%s' ignoring UID: '%s' - split already done&quot; % (self.originator.cuaddr, self.recipient.cuaddr, self.uid))
</span><span class="cx">                 returnValue((True, False, False, None,))
</span><span class="cx">             else:
</span><del>-                self.message.removeProperty(&quot;X-CALENDARSERVER-SPLIT-OLDER-UID&quot;)
</del><ins>+                self.message.removeProperty(&quot;X-CALENDARSERVER-SPLIT-NEWER-UID&quot;)
</ins><span class="cx">                 self.message.removeProperty(&quot;X-CALENDARSERVER-SPLIT-RID&quot;)
</span><span class="cx"> 
</span><span class="cx">         # Different based on method
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/sql.py (14972 => 14973)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1506,7 +1506,7 @@
</span><span class="cx">         self.scheduleTag = options.get(&quot;scheduleTag&quot;, &quot;&quot;)
</span><span class="cx">         self.scheduleEtags = options.get(&quot;scheduleEtags&quot;, &quot;&quot;)
</span><span class="cx">         self.hasPrivateComment = options.get(&quot;hasPrivateComment&quot;, False)
</span><del>-        self._dropboxID = None
</del><ins>+        self._dropboxID = options.get(&quot;dropboxID&quot;, None)
</ins><span class="cx"> 
</span><span class="cx">         # Component caching
</span><span class="cx">         self._cachedComponent = None
</span><span class="lines">@@ -3570,6 +3570,7 @@
</span><span class="cx">             olderResourceName,
</span><span class="cx">             calendar_old,
</span><span class="cx">             ComponentUpdateState.SPLIT_OWNER,
</span><ins>+            options={&quot;dropboxID&quot;: olderUID},
</ins><span class="cx">             split_details=(rid, newerUID, False,)
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="lines">@@ -3602,7 +3603,12 @@
</span><span class="cx"> 
</span><span class="cx">         # Create a new resource and store its data (but not if the parent is &quot;inbox&quot;, or if it is empty)
</span><span class="cx">         if not self.calendar().isInbox() and ical_old.mainType() is not None:
</span><del>-            yield self.calendar()._createCalendarObjectWithNameInternal(&quot;%s.ics&quot; % (olderUID,), ical_old, ComponentUpdateState.SPLIT_ATTENDEE)
</del><ins>+            yield self.calendar()._createCalendarObjectWithNameInternal(
+                &quot;%s.ics&quot; % (olderUID,),
+                ical_old,
+                ComponentUpdateState.SPLIT_ATTENDEE,
+                options={&quot;dropboxID&quot;: olderUID},
+            )
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     class CalendarObjectSplitterWork(WorkItem, fromTable(schema.CALENDAR_OBJECT_SPLITTER_WORK)):
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoretesttest_attachmentspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/test/test_attachments.py (14972 => 14973)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1521,7 +1521,7 @@
</span><span class="cx">         for attach in attachments:
</span><span class="cx">             if attach.hasParameter(&quot;MANAGED-ID&quot;):
</span><span class="cx">                 managed_count += 1
</span><del>-                self.assertTrue(attach.value().find(&quot;/dropbox/&quot;) == -1)
</del><ins>+                self.assertTrue(attach.value().find(&quot;/dropbox/&quot;) != -1)
</ins><span class="cx">                 self.assertTrue(attach.parameterValue(&quot;FILENAME&quot;) in filenames)
</span><span class="cx">             else:
</span><span class="cx">                 dropbox_count += 1
</span><span class="lines">@@ -1699,7 +1699,7 @@
</span><span class="cx">         for attach in attachments:
</span><span class="cx">             if attach.hasParameter(&quot;MANAGED-ID&quot;):
</span><span class="cx">                 managed_count += 1
</span><del>-                self.assertTrue(attach.value().find(&quot;1.2.dropbox&quot;) == -1)
</del><ins>+                self.assertTrue(attach.value().find(&quot;1.2.dropbox&quot;) != -1)
</ins><span class="cx">                 self.assertEqual(attach.parameterValue(&quot;MANAGED-ID&quot;), mnew.managedID())
</span><span class="cx">                 self.assertEqual(attach.parameterValue(&quot;FILENAME&quot;), mnew.name())
</span><span class="cx">             else:
</span><span class="lines">@@ -1737,7 +1737,7 @@
</span><span class="cx">         for attach in attachments:
</span><span class="cx">             if attach.hasParameter(&quot;MANAGED-ID&quot;):
</span><span class="cx">                 managed_count += 1
</span><del>-                self.assertTrue(attach.value().find(&quot;1.2.dropbox&quot;) == -1)
</del><ins>+                self.assertTrue(attach.value().find(&quot;1.2.dropbox&quot;) != -1)
</ins><span class="cx">                 self.assertTrue(attach.parameterValue(&quot;FILENAME&quot;) in (&quot;attach_1_2_1.txt&quot;, &quot;attach_1_2_2.txt&quot;))
</span><span class="cx">             else:
</span><span class="cx">                 dropbox_count += 1
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/test/test_sql.py (14972 => 14973)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3791,6 +3791,7 @@
</span><span class="cx">         self.assertEqual(attachment.value(), location)
</span><span class="cx"> 
</span><span class="cx">         relsubs[&quot;past_mid&quot;] = attachment.parameterValue(&quot;MANAGED-ID&quot;)
</span><ins>+        attachment = ical_past.masterComponent().getProperty(&quot;ATTACH&quot;)
</ins><span class="cx">         relsubs[&quot;att_past_uri&quot;] = attachment.value()
</span><span class="cx"> 
</span><span class="cx">         # Verify user01 data
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer54devtxdavcommondatastoretestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/common/datastore/test/util.py (14972 => 14973)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx">             {&quot;push&quot;: notifierFactory} if notifierFactory is not None else {},
</span><span class="cx">             directoryService,
</span><span class="cx">             attachmentRoot,
</span><del>-            &quot;https://example.com/calendars/__uids__/%(home)s/attachments/%(name)s&quot;,
</del><ins>+            &quot;https://example.com/calendars/__uids__/%(home)s/dropbox/%(dropbox_id)s/%(name)s&quot;,
</ins><span class="cx">             quota=quota
</span><span class="cx">         )
</span><span class="cx">         store.label = currentTestID
</span></span></pre>
</div>
</div>

</body>
</html>