<!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>[13600] twext/trunk/twext/enterprise</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/13600">13600</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-06-03 10:23:37 -0700 (Tue, 03 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix intermittent test errors.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextenterprisequeuepy">twext/trunk/twext/enterprise/queue.py</a></li>
<li><a href="#twexttrunktwextenterprisetesttest_jobqueuepy">twext/trunk/twext/enterprise/test/test_jobqueue.py</a></li>
<li><a href="#twexttrunktwextenterprisetesttest_queuepy">twext/trunk/twext/enterprise/test/test_queue.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextenterprisequeuepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/queue.py (13599 => 13600)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/queue.py 2014-06-03 02:20:23 UTC (rev 13599)
+++ twext/trunk/twext/enterprise/queue.py 2014-06-03 17:23:37 UTC (rev 13600)
</span><span class="lines">@@ -1310,6 +1310,9 @@
</span><span class="cx"> yield peer.performWork(overdueItem.table,
</span><span class="cx"> overdueItem.workID)
</span><span class="cx">
</span><ins>+ if not self.running:
+ return succeed(None)
+
</ins><span class="cx"> return inTransaction(self.transactionFactory, workCheck)
</span><span class="cx">
</span><span class="cx"> _currentWorkDeferred = None
</span></span></pre></div>
<a id="twexttrunktwextenterprisetesttest_jobqueuepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/test/test_jobqueue.py (13599 => 13600)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/test/test_jobqueue.py 2014-06-03 02:20:23 UTC (rev 13599)
+++ twext/trunk/twext/enterprise/test/test_jobqueue.py 2014-06-03 17:23:37 UTC (rev 13600)
</span><span class="lines">@@ -26,7 +26,8 @@
</span><span class="cx"> from twisted.trial.unittest import TestCase, SkipTest
</span><span class="cx"> from twisted.test.proto_helpers import StringTransport, MemoryReactor
</span><span class="cx"> from twisted.internet.defer import \
</span><del>- Deferred, inlineCallbacks, gatherResults, passthru, returnValue, succeed
</del><ins>+ Deferred, inlineCallbacks, gatherResults, passthru, returnValue, succeed, \
+ CancelledError
</ins><span class="cx"> from twisted.internet.task import Clock as _Clock
</span><span class="cx"> from twisted.protocols.amp import Command, AMP, Integer
</span><span class="cx"> from twisted.application.service import Service, MultiService
</span><span class="lines">@@ -1116,7 +1117,12 @@
</span><span class="cx"> self.node1.setServiceParent(ms)
</span><span class="cx"> self.node2.setServiceParent(ms)
</span><span class="cx"> ms.startService()
</span><del>- self.addCleanup(ms.stopService)
</del><ins>+ @inlineCallbacks
+ def _clean():
+ yield ms.stopService()
+ self.flushLoggedErrors(CancelledError)
+
+ self.addCleanup(_clean)
</ins><span class="cx"> yield gatherResults([d1, d2])
</span><span class="cx"> self.store.queuer = self.node1
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextenterprisetesttest_queuepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/test/test_queue.py (13599 => 13600)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/test/test_queue.py 2014-06-03 02:20:23 UTC (rev 13599)
+++ twext/trunk/twext/enterprise/test/test_queue.py 2014-06-03 17:23:37 UTC (rev 13600)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> from twisted.trial.unittest import TestCase, SkipTest
</span><span class="cx"> from twisted.test.proto_helpers import StringTransport, MemoryReactor
</span><span class="cx"> from twisted.internet.defer import (
</span><del>- Deferred, inlineCallbacks, gatherResults, passthru, returnValue
</del><ins>+ Deferred, inlineCallbacks, gatherResults, passthru, returnValue, CancelledError
</ins><span class="cx"> )
</span><span class="cx"> from twisted.internet.task import Clock as _Clock
</span><span class="cx"> from twisted.protocols.amp import Command
</span><span class="lines">@@ -817,7 +817,13 @@
</span><span class="cx"> self.node1.setServiceParent(ms)
</span><span class="cx"> self.node2.setServiceParent(ms)
</span><span class="cx"> ms.startService()
</span><del>- self.addCleanup(ms.stopService)
</del><ins>+
+ @inlineCallbacks
+ def _clean():
+ yield ms.stopService()
+ self.flushLoggedErrors(CancelledError)
+
+ self.addCleanup(_clean)
</ins><span class="cx"> yield gatherResults([d1, d2])
</span><span class="cx"> self.store.queuer = self.node1
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>