<!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>[12467] CalendarServer/branches/users/cdaboo/scheduling-queue-refresh</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/12467">12467</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-28 11:56:12 -0800 (Tue, 28 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Checkpoint: change scheduling queue config default to enabled, but have regular tests disable it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdabooschedulingqueuerefreshtwistedcaldavstdconfigpy">CalendarServer/branches/users/cdaboo/scheduling-queue-refresh/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooschedulingqueuerefreshtwistedcaldavtestutilpy">CalendarServer/branches/users/cdaboo/scheduling-queue-refresh/twistedcaldav/test/util.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooschedulingqueuerefreshtxdavcommondatastoretestutilpy">CalendarServer/branches/users/cdaboo/scheduling-queue-refresh/txdav/common/datastore/test/util.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdabooschedulingqueuerefreshtwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/scheduling-queue-refresh/twistedcaldav/stdconfig.py (12466 => 12467)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/scheduling-queue-refresh/twistedcaldav/stdconfig.py 2014-01-28 19:17:10 UTC (rev 12466)
+++ CalendarServer/branches/users/cdaboo/scheduling-queue-refresh/twistedcaldav/stdconfig.py 2014-01-28 19:56:12 UTC (rev 12467)
</span><span class="lines">@@ -761,7 +761,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> "WorkQueues" : {
</span><del>- "Enabled" : False, # Work queues for scheduling enabled
</del><ins>+ "Enabled" : True, # Work queues for scheduling enabled
</ins><span class="cx"> "RequestDelaySeconds" : 5, # Number of seconds delay for a queued scheduling request/cancel
</span><span class="cx"> "ReplyDelaySeconds" : 1, # Number of seconds delay for a queued scheduling reply
</span><span class="cx"> "AutoReplyDelaySeconds" : 5, # Time delay for sending an auto reply iTIP message
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooschedulingqueuerefreshtwistedcaldavtestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/scheduling-queue-refresh/twistedcaldav/test/util.py (12466 => 12467)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/scheduling-queue-refresh/twistedcaldav/test/util.py 2014-01-28 19:17:10 UTC (rev 12466)
+++ CalendarServer/branches/users/cdaboo/scheduling-queue-refresh/twistedcaldav/test/util.py 2014-01-28 19:56:12 UTC (rev 12467)
</span><span class="lines">@@ -231,6 +231,7 @@
</span><span class="cx"> os.mkdir(self.serverRoot)
</span><span class="cx">
</span><span class="cx"> config.reset()
</span><ins>+ self.configInit()
</ins><span class="cx">
</span><span class="cx"> config.ServerRoot = os.path.abspath(self.serverRoot)
</span><span class="cx"> config.ConfigRoot = "config"
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooschedulingqueuerefreshtxdavcommondatastoretestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/scheduling-queue-refresh/txdav/common/datastore/test/util.py (12466 => 12467)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/scheduling-queue-refresh/txdav/common/datastore/test/util.py 2014-01-28 19:17:10 UTC (rev 12466)
+++ CalendarServer/branches/users/cdaboo/scheduling-queue-refresh/txdav/common/datastore/test/util.py 2014-01-28 19:56:12 UTC (rev 12467)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.python.filepath import CachingFilePath
</span><del>-from twistedcaldav.ical import Component as VComponent
</del><ins>+from twistedcaldav.ical import Component as VComponent, Component
</ins><span class="cx"> from twext.enterprise.adbapi2 import ConnectionPool
</span><span class="cx"> from twext.enterprise.ienterprise import AlreadyFinishedError
</span><span class="cx"> from txweb2.dav.resource import TwistedGETContentMD5
</span><span class="lines">@@ -529,7 +529,35 @@
</span><span class="cx"> return data % {"now": nowYear}
</span><span class="cx">
</span><span class="cx">
</span><ins>+dateSubstitutions = {}
</ins><span class="cx">
</span><ins>+
+def componentUpdate(data):
+ """
+ Update the supplied iCalendar data so that all dates are updated to the current year.
+ """
+
+ if len(dateSubstitutions) == 0:
+ now = DateTime.getToday()
+
+ dateSubstitutions["now"] = now
+
+ for i in range(30):
+ attrname = "now_back%s" % (i + 1,)
+ setattr(self, attrname, now.duplicate())
+ getattr(self, attrname).offsetDay(-(i + 1))
+ dateSubstitutions[attrname] = getattr(self, attrname)
+
+ for i in range(30):
+ attrname = "now_fwd%s" % (i + 1,)
+ setattr(self, attrname, now.duplicate())
+ getattr(self, attrname).offsetDay(i + 1)
+ dateSubstitutions[attrname] = getattr(self, attrname)
+
+ return Component.fromString(data.format(dateSubstitutions))
+
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def resetCalendarMD5s(md5s, store):
</span><span class="cx"> """
</span><span class="lines">@@ -713,8 +741,21 @@
</span><span class="cx"> def setUp(self):
</span><span class="cx"> self.counter = 0
</span><span class="cx"> self.notifierFactory = StubNotifierFactory()
</span><ins>+ self.configInit()
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ def configInit(self):
+ """
+ Hard code some config options
+ """
+
+ # Work queues for implicit scheduling slow down tests a lot and require them all to add
+ # "waits" for work to complete. Rewriting all the current tests to do that is not practical
+ # right now, so we will turn this off by default. Instead we will have a set of tests dedicated
+ # to work queue-based scheduling which will patch this option to True.
+ config.Scheduling.Options.WorkQueues.Enabled = False
+
+
</ins><span class="cx"> def storeUnderTest(self):
</span><span class="cx"> """
</span><span class="cx"> Subclasses must implement this method.
</span></span></pre>
</div>
</div>
</body>
</html>