<!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>[15326] 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/15326">15326</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-11-17 08:57:55 -0800 (Tue, 17 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Whitespace.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaptesttest_utilpy">CalendarServer/trunk/calendarserver/tap/test/test_util.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsconfigpy">CalendarServer/trunk/calendarserver/tools/config.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsdelegatesmigrationpy">CalendarServer/trunk/calendarserver/tools/delegatesmigration.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_configpy">CalendarServer/trunk/calendarserver/tools/test/test_config.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_gatewaypy">CalendarServer/trunk/calendarserver/tools/test/test_gateway.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminconfigpy">CalendarServer/trunk/calendarserver/webadmin/config.py</a></li>
<li><a href="#CalendarServertrunkcontribodsetup_directorypy">CalendarServer/trunk/contrib/od/setup_directory.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestpopulationpy">CalendarServer/trunk/contrib/performance/loadtest/population.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestprofilespy">CalendarServer/trunk/contrib/performance/loadtest/profiles.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesttest_profilespy">CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaptesttest_utilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/test/test_util.py (15325 => 15326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_util.py 2015-11-17 16:31:59 UTC (rev 15325)
+++ CalendarServer/trunk/calendarserver/tap/test/test_util.py 2015-11-17 16:57:55 UTC (rev 15326)
</span><span class="lines">@@ -301,6 +301,7 @@
</span><span class="cx"> self.assertFalse(success)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class AlertTestCase(TestCase):
</span><span class="cx">
</span><span class="cx"> def test_secondsSinceLastPost(self):
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/config.py (15325 => 15326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/config.py 2015-11-17 16:31:59 UTC (rev 15325)
+++ CalendarServer/trunk/calendarserver/tools/config.py 2015-11-17 16:57:55 UTC (rev 15326)
</span><span class="lines">@@ -126,6 +126,7 @@
</span><span class="cx"> sys.exit(0)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def runAsRootCheck():
</span><span class="cx"> """
</span><span class="cx"> If we're running in Server.app context and are not running as root, exit.
</span><span class="lines">@@ -137,6 +138,7 @@
</span><span class="cx"> sys.exit(1)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def main():
</span><span class="cx">
</span><span class="cx"> runAsRootCheck()
</span><span class="lines">@@ -247,6 +249,7 @@
</span><span class="cx"> processArgs(writable, args)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def setServiceState(service, state):
</span><span class="cx"> """
</span><span class="cx"> Invoke serverctl to enable/disable a service
</span><span class="lines">@@ -258,13 +261,14 @@
</span><span class="cx"> stdout=subprocess.PIPE,
</span><span class="cx"> stderr=subprocess.PIPE,
</span><span class="cx"> )
</span><del>- output, error = child.communicate()
</del><ins>+ _ignore_output, error = child.communicate()
</ins><span class="cx"> if child.returncode:
</span><span class="cx"> sys.stdout.write(
</span><span class="cx"> "Error from serverctl: %d, %s" % (child.returncode, error)
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def setEnabled(enabled):
</span><span class="cx"> command = {
</span><span class="cx"> "command": "writeConfig",
</span><span class="lines">@@ -278,6 +282,7 @@
</span><span class="cx"> runner.run()
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def setReverseProxies():
</span><span class="cx"> """
</span><span class="cx"> Invoke calendarserver_reverse_proxies
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsdelegatesmigrationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/delegatesmigration.py (15325 => 15326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/delegatesmigration.py 2015-11-17 16:31:59 UTC (rev 15325)
+++ CalendarServer/trunk/calendarserver/tools/delegatesmigration.py 2015-11-17 16:57:55 UTC (rev 15326)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> def main():
</span><span class="cx"> try:
</span><del>- (optargs, args) = getopt(
</del><ins>+ (optargs, _ignore_args) = getopt(
</ins><span class="cx"> sys.argv[1:], "d:f:hp:P:s:t:u:", [
</span><span class="cx"> "help",
</span><span class="cx"> "config=",
</span><span class="lines">@@ -152,6 +152,7 @@
</span><span class="cx"> utilityMain(configFileName, DelegatesMigrationService)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def getAssignments(db):
</span><span class="cx"> """
</span><span class="lines">@@ -165,6 +166,7 @@
</span><span class="cx"> returnValue(rows)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def copyAssignments(assignments, pod, directory, store):
</span><span class="cx"> """
</span><span class="lines">@@ -272,6 +274,7 @@
</span><span class="cx"> print(uid)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def migrateDelegates(service, store, server, user, password, pod, database, dbtype):
</span><span class="cx"> print("Migrating from server {}".format(server))
</span><span class="lines">@@ -288,6 +291,5 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> if __name__ == "__main__":
</span><span class="cx"> main()
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_configpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_config.py (15325 => 15326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_config.py 2015-11-17 16:31:59 UTC (rev 15325)
+++ CalendarServer/trunk/calendarserver/tools/test/test_config.py 2015-11-17 16:57:55 UTC (rev 15326)
</span><span class="lines">@@ -410,8 +410,6 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> def test_keyPath(self):
</span><span class="cx"> d = ConfigDict()
</span><span class="cx"> setKeyPath(d, "one", "A")
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_gatewaypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_gateway.py (15325 => 15326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_gateway.py 2015-11-17 16:31:59 UTC (rev 15325)
+++ CalendarServer/trunk/calendarserver/tools/test/test_gateway.py 2015-11-17 16:57:55 UTC (rev 15326)
</span><span class="lines">@@ -183,7 +183,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class GatewayTestCase(RunCommandTestCase):
</span><span class="cx">
</span><span class="cx"> def _flush(self):
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/config.py (15325 => 15326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/config.py 2015-11-17 16:31:59 UTC (rev 15325)
+++ CalendarServer/trunk/calendarserver/webadmin/config.py 2015-11-17 16:57:55 UTC (rev 15326)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> name = html.code(namespace)
</span><span class="cx">
</span><span class="cx"> value = html.code(
</span><del>- Logger.publisher.levels.logLevelForNamespace(
</del><ins>+ Logger.levels().logLevelForNamespace(
</ins><span class="cx"> namespace
</span><span class="cx"> ).name
</span><span class="cx"> )
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # FIXME: Using private attributes is bad.
</span><del>- namespaces = Logger.publisher.levels._logLevelsByNamespace.keys()
</del><ins>+ namespaces = Logger.levels()._logLevelsByNamespace.keys()
</ins><span class="cx">
</span><span class="cx"> return rowsForNamespaces(namespaces)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcontribodsetup_directorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/od/setup_directory.py (15325 => 15326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/od/setup_directory.py 2015-11-17 16:31:59 UTC (rev 15325)
+++ CalendarServer/trunk/contrib/od/setup_directory.py 2015-11-17 16:57:55 UTC (rev 15326)
</span><span class="lines">@@ -260,6 +260,7 @@
</span><span class="cx"> sys.exit(0)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def lookupRecordName(node, recordType, name):
</span><span class="cx"> query, error = odframework.ODQuery.queryWithNode_forRecordTypes_attribute_matchType_queryValues_returnAttributes_maximumResults_error_(
</span><span class="cx"> node,
</span><span class="lines">@@ -329,8 +330,6 @@
</span><span class="cx"> },
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> session = odframework.ODSession.defaultSession()
</span><span class="cx"> userRecords = []
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestpopulationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/population.py (15325 => 15326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/population.py 2015-11-17 16:31:59 UTC (rev 15325)
+++ CalendarServer/trunk/contrib/performance/loadtest/population.py 2015-11-17 16:57:55 UTC (rev 15326)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> # There is only one item and caller doesn't want it!
</span><span class="cx"> return None
</span><span class="cx">
</span><del>- for i in xrange(100):
</del><ins>+ for _i in xrange(100):
</ins><span class="cx"> # Try to find one that is not "besides"
</span><span class="cx"> n = self._random.randint(0, count - 1)
</span><span class="cx"> if besides != n:
</span><span class="lines">@@ -208,7 +208,6 @@
</span><span class="cx"> return self._records[n]
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def _nextUserNumber(self):
</span><span class="cx"> result = self._user
</span><span class="cx"> self._user += 1
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestprofilespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/profiles.py (15325 => 15326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/profiles.py 2015-11-17 16:31:59 UTC (rev 15325)
+++ CalendarServer/trunk/contrib/performance/loadtest/profiles.py 2015-11-17 16:57:55 UTC (rev 15326)
</span><span class="lines">@@ -218,7 +218,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class Inviter(ProfileBase):
</span><span class="cx"> """
</span><span class="cx"> A Calendar user who invites other users to new events.
</span><span class="lines">@@ -602,6 +601,7 @@
</span><span class="cx"> return self._newOperation("create", d)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class EventUpdaterBase(ProfileBase):
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -633,10 +633,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def modifyEvent(self, href, vevent):
</span><del>- """Overriden by subclasses"""
</del><ins>+ """Overridden by subclasses"""
</ins><span class="cx"> pass
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class TitleChanger(EventUpdaterBase):
</span><span class="cx">
</span><span class="cx"> def setParameters(
</span><span class="lines">@@ -649,12 +650,14 @@
</span><span class="cx"> self._interval = interval
</span><span class="cx"> self._titleLength = titleLengthDistribution
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def modifyEvent(self, _ignore_href, vevent):
</span><span class="cx"> length = max(5, int(self._titleLength.sample()))
</span><span class="cx"> vevent.replaceProperty(Property("SUMMARY", "Event" + "." * (length - 5)))
</span><span class="cx"> return succeed("update{title}")
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class Attacher(EventUpdaterBase):
</span><span class="cx">
</span><span class="cx"> def setParameters(
</span><span class="lines">@@ -667,6 +670,7 @@
</span><span class="cx"> self._interval = interval
</span><span class="cx"> self._fileSize = fileSizeDistribution
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def modifyEvent(self, href, vevent):
</span><span class="cx"> fileSize = int(self._fileSize.sample())
</span><span class="lines">@@ -674,6 +678,7 @@
</span><span class="cx"> returnValue("attach{files}")
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class EventCountLimiter(EventUpdaterBase):
</span><span class="cx"> """
</span><span class="cx"> Examines the number of events in each calendar collection, and when that
</span><span class="lines">@@ -691,6 +696,7 @@
</span><span class="cx"> self._interval = interval
</span><span class="cx"> self._limit = eventCountLimit
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def action(self):
</span><span class="cx"> # Don't perform any operations until the client is up and running
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_profilespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py (15325 => 15326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py 2015-11-17 16:31:59 UTC (rev 15325)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py 2015-11-17 16:57:55 UTC (rev 15326)
</span><span class="lines">@@ -1094,6 +1094,7 @@
</span><span class="cx"> logger.failures())
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class AlarmAcknowledgerTests(TestCase):
</span><span class="cx">
</span><span class="cx"> def test_pastTheHour(self):
</span></span></pre>
</div>
</div>
</body>
</html>