<!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>[13345] CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py</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/13345">13345</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-21 10:03:59 -0700 (Mon, 21 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix test failure after recent attachment size limit changes.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_attachmentspy">CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_attachmentspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py (13344 => 13345)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py        2014-04-21 16:18:28 UTC (rev 13344)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py        2014-04-21 17:03:59 UTC (rev 13345)
</span><span class="lines">@@ -856,7 +856,12 @@
</span><span class="cx">         self.patch(config, &quot;EnableManagedAttachments&quot;, True)
</span><span class="cx">         self._sqlCalendarStore.enableManagedAttachments = True
</span><span class="cx"> 
</span><ins>+        # Make it look like we have migrated
+        if (yield self.transactionUnderTest().calendarserverValue(&quot;MANAGED-ATTACHMENTS&quot;, raiseIfMissing=False)) is None:
+            yield self.transactionUnderTest().setCalendarserverValue(&quot;MANAGED-ATTACHMENTS&quot;, &quot;1&quot;)
+        yield self.commit()
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx">     @inlineCallbacks
</span><span class="cx">     def createAttachmentTest(self, refresh):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="lines">@@ -1133,7 +1138,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><del>-    def exceedSizeTest(self, getit):
</del><ins>+    def exceedSizeTest(self, getit, name):
</ins><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         If too many bytes are passed to the transport returned by
</span><span class="cx">         L{ICalendarObject.createAttachmentWithName},
</span><span class="lines">@@ -1141,7 +1146,7 @@
</span><span class="cx">         that fails with L{AttachmentSizeTooLarge}.
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         attachment = yield getit()
</span><del>-        t = attachment.store(MimeType(&quot;text&quot;, &quot;x-fixture&quot;), &quot;&quot;)
</del><ins>+        t = attachment.store(MimeType(&quot;text&quot;, &quot;x-fixture&quot;), name)
</ins><span class="cx">         sample = &quot;all work and no play makes jack a dull boy&quot;
</span><span class="cx">         chunk = (sample * (config.MaximumAttachmentSize / len(sample)))
</span><span class="cx"> 
</span><span class="lines">@@ -1161,12 +1166,12 @@
</span><span class="cx">         self.patch(config, &quot;MaximumAttachmentSize&quot;, 100)
</span><span class="cx">         obj = yield self.calendarObjectUnderTest()
</span><span class="cx">         yield self.exceedSizeTest(
</span><del>-            lambda: obj.createAttachmentWithName(&quot;too-big.attachment&quot;)
</del><ins>+            lambda: obj.createManagedAttachment(), &quot;too-big.attachment&quot;
</ins><span class="cx">         )
</span><del>-        self.assertEquals((yield obj.attachments()), [])
</del><ins>+        self.assertEquals((yield obj.managedAttachmentList()), [])
</ins><span class="cx">         yield self.commit()
</span><span class="cx">         obj = yield self.calendarObjectUnderTest()
</span><del>-        self.assertEquals((yield obj.attachments()), [])
</del><ins>+        self.assertEquals((yield obj.managedAttachmentList()), [])
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><span class="lines">@@ -1177,14 +1182,14 @@
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         self.patch(config, &quot;MaximumAttachmentSize&quot;, 100)
</span><span class="cx">         obj = yield self.calendarObjectUnderTest()
</span><del>-        create = lambda: obj.createAttachmentWithName(&quot;exists.attachment&quot;)
-        get = lambda: obj.attachmentWithName(&quot;exists.attachment&quot;)
</del><ins>+        create = lambda: obj.createManagedAttachment()
</ins><span class="cx">         attachment = yield create()
</span><del>-        t = attachment.store(MimeType(&quot;text&quot;, &quot;x-fixture&quot;), &quot;&quot;)
</del><ins>+        get = lambda: obj.attachmentWithManagedID(attachment.managedID())
+        t = attachment.store(MimeType(&quot;text&quot;, &quot;x-fixture&quot;), &quot;new.attachment&quot;)
</ins><span class="cx">         sampleData = &quot;a reasonably sized attachment&quot;
</span><span class="cx">         t.write(sampleData)
</span><span class="cx">         yield t.loseConnection()
</span><del>-        yield self.exceedSizeTest(get)
</del><ins>+        yield self.exceedSizeTest(get, &quot;exists.attachment&quot;)
</ins><span class="cx">         @inlineCallbacks
</span><span class="cx">         def checkOriginal():
</span><span class="cx">             actual = yield self.attachmentToString(attachment)
</span><span class="lines">@@ -1563,6 +1568,12 @@
</span><span class="cx">             Where=None
</span><span class="cx">         ).on(txn)
</span><span class="cx"> 
</span><ins>+        cs = schema.CALENDARSERVER
+        yield Delete(
+            From=cs,
+            Where=cs.NAME == &quot;MANAGED-ATTACHMENTS&quot;
+        ).on(txn)
+
</ins><span class="cx">         yield txn.commit()
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>