<!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>[14329] CalendarServer/trunk</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/14329">14329</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-01-20 10:52:35 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix tests to not depend on worker pool</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaptesttest_caldavpy">CalendarServer/trunk/calendarserver/tap/test/test_caldav.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoretestutilpy">CalendarServer/trunk/txdav/common/datastore/test/util.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaptesttest_caldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py (14328 => 14329)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2015-01-20 01:45:36 UTC (rev 14328)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2015-01-20 18:52:35 UTC (rev 14329)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> from twisted.internet.defer import Deferred, inlineCallbacks, succeed
</span><span class="cx"> from twisted.internet.task import Clock
</span><span class="cx"> from twisted.internet import reactor
</span><del>-from twisted.application.service import (IService, IServiceCollection,
- MultiService)
</del><ins>+from twisted.application.service import (IService, IServiceCollection
+ )
</ins><span class="cx"> from twisted.application import internet
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> DataStoreMonitor
</span><span class="cx"> )
</span><span class="cx"> from calendarserver.provision.root import RootResource
</span><del>-from twext.enterprise.jobqueue import PeerConnectionPool, LocalQueuer
</del><span class="cx"> from StringIO import StringIO
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="lines">@@ -463,66 +462,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class StoreQueuerSetInMasterTests(CalDAVServiceMakerTestBase):
-
- def configure(self):
- super(StoreQueuerSetInMasterTests, self).configure()
- config.ProcessType = "Combined"
-
-
- def test_storeQueuerSetInMaster(self):
- """
- In the master, the store's queuer should be set to a
- L{PeerConnectionPool}, so that work can be distributed to other
- processes.
- """
- class NotAStore(object):
- queuer = LocalQueuer(None)
-
- def __init__(self, directory):
- self.directory = directory
-
- def newTransaction(self):
- return None
-
- def callWithNewTransactions(self, x):
- pass
-
- def directoryService(self):
- return self.directory
-
- store = NotAStore(self.directory)
-
-
- def something(proposal):
- pass
-
- store.queuer.callWithNewProposals(something)
-
-
- def patch(maker):
- def storageServiceStandIn(createMainService, logObserver,
- uid=None, gid=None, directory=None):
- pool = None
- logObserver = None
- storageService = None
- svc = createMainService(
- pool, store, logObserver, storageService
- )
- multi = MultiService()
- svc.setServiceParent(multi)
- return multi
- self.patch(maker, "storageService", storageServiceStandIn)
- return maker
-
- maker = CalDAVServiceMaker()
- maker = patch(maker)
- maker.makeService(self.options)
- self.assertIsInstance(store.queuer, PeerConnectionPool)
- self.assertIn(something, store.queuer.proposalCallbacks)
-
-
-
</del><span class="cx"> class SlaveServiceTests(CalDAVServiceMakerTestBase):
</span><span class="cx"> """
</span><span class="cx"> Test various configurations of the Slave service
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoretestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/util.py (14328 => 14329)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/util.py 2015-01-20 01:45:36 UTC (rev 14328)
+++ CalendarServer/trunk/txdav/common/datastore/test/util.py 2015-01-20 18:52:35 UTC (rev 14329)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> # Start the job queue after store is up and cleaned
</span><span class="cx"> if enableJobProcessing:
</span><span class="cx"> pool = PeerConnectionPool(
</span><del>- reactor, store.newTransaction, None
</del><ins>+ reactor, store.newTransaction, None, useWorkerPool=False
</ins><span class="cx"> )
</span><span class="cx"> store.queuer = store.queuer.transferProposalCallbacks(pool)
</span><span class="cx"> pool.startService()
</span></span></pre>
</div>
</div>
</body>
</html>