<!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>[14967] CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip</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/14967">14967</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-15 08:16:58 -0700 (Wed, 15 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle iMIP/IMAP race condition in multi-pod mode.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingimipinboundpy">CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/inbound.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingimiptesttest_inboundpy">CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/test/test_inbound.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingimipinboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/inbound.py (14966 => 14967)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/inbound.py 2015-07-15 15:13:38 UTC (rev 14966)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/inbound.py 2015-07-15 15:16:58 UTC (rev 14967)
</span><span class="lines">@@ -624,7 +624,7 @@
</span><span class="cx"> self.log.debug("IMAP in cbGotMessage")
</span><span class="cx"> try:
</span><span class="cx"> messageData = results.values()[0]['RFC822']
</span><del>- except IndexError:
</del><ins>+ except (IndexError, KeyError):
</ins><span class="cx"> # results will be empty unless the "twistedmail-imap-flags-anywhere"
</span><span class="cx"> # patch from http://twistedmatrix.com/trac/ticket/1105 is applied
</span><span class="cx"> self.log.error("Skipping empty results -- apply twisted patch!")
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingimiptesttest_inboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/test/test_inbound.py (14966 => 14967)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/test/test_inbound.py 2015-07-15 15:13:38 UTC (rev 14966)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/test/test_inbound.py 2015-07-15 15:16:58 UTC (rev 14967)
</span><span class="lines">@@ -60,7 +60,14 @@
</span><span class="cx"> module = getModule(__name__)
</span><span class="cx"> self.dataPath = module.filePath.sibling("data")
</span><span class="cx">
</span><ins>+ self.wp = None
+ self.store.queuer.callWithNewProposals(self._proposalCallback)
</ins><span class="cx">
</span><ins>+
+ def _proposalCallback(self, wp):
+ self.wp = wp
+
+
</ins><span class="cx"> def dataFile(self, name):
</span><span class="cx"> """
</span><span class="cx"> Get the contents of a given data file from the 'data/mail' test
</span><span class="lines">@@ -183,6 +190,7 @@
</span><span class="cx"> calBody = template % token
</span><span class="cx"> result = (yield self.receiver.processDSN(calBody, "xyzzy"))
</span><span class="cx"> self.assertEquals(result, MailReceiver.INJECTION_SUBMITTED)
</span><ins>+ yield self.wp.whenExecuted()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -205,6 +213,7 @@
</span><span class="cx">
</span><span class="cx"> result = (yield self.receiver.processReply(msg))
</span><span class="cx"> self.assertEquals(result, MailReceiver.INJECTION_SUBMITTED)
</span><ins>+ yield self.wp.whenExecuted()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_processReplyMissingOrganizer(self):
</span><span class="lines">@@ -436,7 +445,34 @@
</span><span class="cx"> self.assertEquals(self.flagDeletedResult, "xyzzy")
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_missingIMAPMessages(self):
+ """
+ Make sure L{IMAP4DownloadProtocol.cbGotMessage} can deal with missing messages.
+ """
</ins><span class="cx">
</span><ins>+ class DummyResult(object):
+ def __init__(self):
+ self._values = []
+
+ def values(self):
+ return self._values
+
+ noResult = DummyResult()
+ missingKey = DummyResult()
+ missingKey.values().append({})
+
+ imap4 = IMAP4DownloadProtocol()
+ imap4.messageUIDs = []
+ imap4.fetchNextMessage = lambda : None
+
+ result = yield imap4.cbGotMessage(noResult, [])
+ self.assertTrue(result is None)
+ result = yield imap4.cbGotMessage(missingKey, [])
+ self.assertTrue(result is None)
+
+
+
</ins><span class="cx"> class StubFactory(object):
</span><span class="cx">
</span><span class="cx"> def __init__(self, actionTaken, deleteAllMail):
</span></span></pre>
</div>
</div>
</body>
</html>