<!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>[15707] 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/15707">15707</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-06-25 07:26:18 -0700 (Sat, 25 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Whitespace.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverpushapplepushpy">CalendarServer/trunk/calendarserver/push/applepush.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverpushtesttest_notifierpy">CalendarServer/trunk/calendarserver/push/test/test_notifier.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesticalpy">CalendarServer/trunk/contrib/performance/loadtest/ical.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestsimpy">CalendarServer/trunk/contrib/performance/loadtest/sim.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesttest_amphubpy">CalendarServer/trunk/contrib/performance/loadtest/test_amphub.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesttest_icalpy">CalendarServer/trunk/contrib/performance/loadtest/test_ical.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesttest_profilespy">CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverpushapplepushpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/applepush.py (15706 => 15707)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/applepush.py 2016-06-25 14:24:48 UTC (rev 15706)
+++ CalendarServer/trunk/calendarserver/push/applepush.py 2016-06-25 14:26:18 UTC (rev 15707)
</span><span class="lines">@@ -178,7 +178,6 @@
</span><span class="cx"> service.MultiService.stopService(self)
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def enqueue(
</span><span class="cx"> self, transaction, pushKey, dataChangedTimestamp=None,
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverpushtesttest_notifierpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/test/test_notifier.py (15706 => 15707)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/test/test_notifier.py 2016-06-25 14:24:48 UTC (rev 15706)
+++ CalendarServer/trunk/calendarserver/push/test/test_notifier.py 2016-06-25 14:26:18 UTC (rev 15707)
</span><span class="lines">@@ -161,7 +161,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class StubDistributor(object):
</span><span class="cx"> def __init__(self):
</span><span class="cx"> self.reset()
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesticalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py (15706 => 15707)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/ical.py 2016-06-25 14:24:48 UTC (rev 15706)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py 2016-06-25 14:26:18 UTC (rev 15707)
</span><span class="lines">@@ -926,7 +926,6 @@
</span><span class="cx"> returnValue((newCalendars.values(), notificationCollection, newCalendarHomeToken))
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def timeRangeQuery(self, url, start, end):
</span><span class="cx">
</span><span class="cx"> requestBody = """<?xml version="1.0" encoding="utf-8" ?>
</span><span class="lines">@@ -967,7 +966,7 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def deepRefresh(self):
</span><del>- calendars, notificationCollection, calendarHomeToken, results = yield self._calendarHomePropfind(self.calendarHomeHref)
</del><ins>+ calendars, _ignore_notificationCollection, _ignore_calendarHomeToken, _ignore_results = yield self._calendarHomePropfind(self.calendarHomeHref)
</ins><span class="cx"> for calendar in calendars:
</span><span class="cx"> yield self._propfind(
</span><span class="cx"> calendar.url,
</span><span class="lines">@@ -1732,13 +1731,12 @@
</span><span class="cx"> connect(GAIEndpoint(self.reactor, host, port), factory)
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _receivedPush(self, inboundID, dataChangedTimestamp, priority=5):
</span><span class="cx"> if not self._busyWithPush:
</span><span class="cx"> self._busyWithPush = True
</span><span class="cx"> try:
</span><del>- for href, myId in self.ampPushKeys.iteritems():
</del><ins>+ for _ignore_href, myId in self.ampPushKeys.iteritems():
</ins><span class="cx"> if inboundID == myId:
</span><span class="cx"> yield self._checkCalendarsForEvents(self.calendarHomeHref, push=True)
</span><span class="cx"> break
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestsimpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/sim.py (15706 => 15707)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/sim.py 2016-06-25 14:24:48 UTC (rev 15706)
+++ CalendarServer/trunk/contrib/performance/loadtest/sim.py 2016-06-25 14:26:18 UTC (rev 15707)
</span><span class="lines">@@ -504,7 +504,6 @@
</span><span class="cx"> AMPHub.start(hostsAndPorts)
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def run(self, output=stdout):
</span><span class="cx"> self.attachServices(output)
</span><span class="cx"> if self.runtime is not None:
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_amphubpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_amphub.py (15706 => 15707)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_amphub.py 2016-06-25 14:24:48 UTC (rev 15706)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_amphub.py 2016-06-25 14:26:18 UTC (rev 15707)
</span><span class="lines">@@ -25,16 +25,19 @@
</span><span class="cx"> def __init__(self, history):
</span><span class="cx"> self.history = history
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def callRemote(self, *args, **kwds):
</span><span class="cx"> self.history.append((args, kwds))
</span><span class="cx"> return succeed(None)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class AMPHubTestCase(TestCase):
</span><span class="cx">
</span><span class="cx"> def callback(self, id, dataChangedTimestamp, priority=5):
</span><span class="cx"> self.callbackHistory.append(id)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_amphub(self):
</span><span class="cx"> amphub = AMPHub()
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_icalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_ical.py (15706 => 15707)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_ical.py 2016-06-25 14:24:48 UTC (rev 15706)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_ical.py 2016-06-25 14:26:18 UTC (rev 15707)
</span><span class="lines">@@ -1242,7 +1242,7 @@
</span><span class="cx"> constructed from the data extracted from the response.
</span><span class="cx"> """
</span><span class="cx"> home = "/calendars/__uids__/user01/"
</span><del>- calendars, notificationCollection, homeToken = self.client._extractCalendars(
</del><ins>+ calendars, notificationCollection, _ignore_homeToken = self.client._extractCalendars(
</ins><span class="cx"> self.client._parseMultiStatus(CALENDAR_HOME_PROPFIND_RESPONSE), home)
</span><span class="cx"> calendars.sort(key=lambda cal: cal.resourceType)
</span><span class="cx"> calendar, inbox = calendars
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_profilespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py (15706 => 15707)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py 2016-06-25 14:24:48 UTC (rev 15706)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py 2016-06-25 14:26:18 UTC (rev 15707)
</span><span class="lines">@@ -1037,6 +1037,7 @@
</span><span class="cx"> # XXX Vary the event period/interval and the uid
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class AttachmentDownloaderTests(TestCase):
</span><span class="cx"> """
</span><span class="cx"> Tests for L{AttachmentDownloader}.
</span><span class="lines">@@ -1046,6 +1047,7 @@
</span><span class="cx"> self.sim = CalendarClientSimulator(
</span><span class="cx"> AnyUser(), Populator(None), None, None, None, None, None, None)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_normalize(self):
</span><span class="cx"> client = StubClient(1, self.mktemp())
</span><span class="cx"> client._managed_attachments_server_url = "https://thisserver:8443"
</span><span class="lines">@@ -1056,6 +1058,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class OperationLoggerTests(TestCase):
</span><span class="cx"> """
</span><span class="cx"> Tests for L{OperationLogger}.
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (15706 => 15707)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2016-06-25 14:24:48 UTC (rev 15706)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2016-06-25 14:26:18 UTC (rev 15707)
</span><span class="lines">@@ -5560,12 +5560,14 @@
</span><span class="cx"> returnValue(name)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class UnsupportedQuery(Exception):
</span><span class="cx"> """
</span><span class="cx"> Indicates the particular set of query parameters passed are not supported.
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class TrashCollection(Calendar):
</span><span class="cx">
</span><span class="cx"> _childType = _CHILD_TYPE_TRASH
</span></span></pre>
</div>
</div>
</body>
</html>