<!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>[15648] CalendarServer/trunk/contrib/performance/loadtest</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/15648">15648</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2016-06-02 20:52:46 -0700 (Thu, 02 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>The sim now uses sync report on homes instead of propfinds</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadtesticalpy">CalendarServer/trunk/contrib/performance/loadtest/ical.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestrequestdataOS_X_10_11poll_calendarhome_syncrequest">CalendarServer/trunk/contrib/performance/loadtest/request-data/OS_X_10_11/poll_calendarhome_sync.request</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="#CalendarServertrunkcontribperformanceloadtesttest_simpy">CalendarServer/trunk/contrib/performance/loadtest/test_sim.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcontribperformanceloadtesticalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py (15647 => 15648)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/ical.py 2016-06-02 16:41:06 UTC (rev 15647)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py 2016-06-03 03:52:46 UTC (rev 15648)
</span><span class="lines">@@ -493,6 +493,7 @@
</span><span class="cx"> _POLL_NOTIFICATION_PROPFIND_D1 = None
</span><span class="cx">
</span><span class="cx"> _NOTIFICATION_SYNC_REPORT = None
</span><ins>+ _CALENDARHOME_SYNC_REPORT = None
</ins><span class="cx">
</span><span class="cx"> _USER_LIST_PRINCIPAL_PROPERTY_SEARCH = None
</span><span class="cx"> _POST_AVAILABILITY = None
</span><span class="lines">@@ -540,6 +541,7 @@
</span><span class="cx"> self.calendarHomePollInterval = calendarHomePollInterval
</span><span class="cx">
</span><span class="cx"> self.calendarHomeHref = None
</span><ins>+ self.calendarHomeToken = ""
</ins><span class="cx">
</span><span class="cx"> self.supportPush = supportPush
</span><span class="cx">
</span><span class="lines">@@ -554,6 +556,7 @@
</span><span class="cx">
</span><span class="cx"> self.supportSync = self._SYNC_REPORT
</span><span class="cx"> self.supportNotificationSync = self._NOTIFICATION_SYNC_REPORT
</span><ins>+ self.supportCalendarHomeSync = self._CALENDARHOME_SYNC_REPORT
</ins><span class="cx">
</span><span class="cx"> self.supportEnhancedAttendeeAutoComplete = self._CALENDARSERVER_PRINCIPAL_SEARCH_REPORT
</span><span class="cx">
</span><span class="lines">@@ -626,7 +629,7 @@
</span><span class="cx"> method=method_label if method_label else method,
</span><span class="cx"> url=url,
</span><span class="cx"> user=self.record.uid,
</span><del>- client_type=self.title,
</del><ins>+ client_type="({} {})".format(self.title, self._instanceNumber),
</ins><span class="cx"> client_id=self._client_id,
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -648,7 +651,7 @@
</span><span class="cx"> responseBody=responseBody,
</span><span class="cx"> code=response.code,
</span><span class="cx"> user=self.record.uid,
</span><del>- client_type=self.title,
</del><ins>+ client_type="({} {})".format(self.title, self._instanceNumber),
</ins><span class="cx"> client_id=self._client_id,
</span><span class="cx"> duration=(after - before),
</span><span class="cx"> url=url,
</span><span class="lines">@@ -852,13 +855,66 @@
</span><span class="cx"> depth='1',
</span><span class="cx"> method_label="PROPFIND{home}",
</span><span class="cx"> )
</span><del>- calendars, notificationCollection = self._extractCalendars(
</del><ins>+ calendars, notificationCollection, calendarHomeToken = self._extractCalendars(
</ins><span class="cx"> result, calendarHomeSet
</span><span class="cx"> )
</span><del>- returnValue((calendars, notificationCollection, result,))
</del><ins>+ returnValue((calendars, notificationCollection, calendarHomeToken, result,))
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def _calendarHomeSync(self, calendarHomeSet):
+ if not calendarHomeSet.endswith('/'):
+ calendarHomeSet = calendarHomeSet + '/'
</ins><span class="cx">
</span><ins>+ result = yield self._report(
+ calendarHomeSet,
+ self._CALENDARHOME_SYNC_REPORT % {'sync-token': self.calendarHomeToken},
+ depth='1',
+ allowedStatus=(MULTI_STATUS, FORBIDDEN,),
+ otherTokens=True,
+ method_label="REPORT{sync-home}",
+ )
+ responseHrefs, others = result
+
+ calendars, notificationCollection, ignored = self._extractCalendars(
+ responseHrefs, calendarHomeSet
+ )
+
+ # if notificationCollection is None that means it hasn't changed, so
+ # we'll return the notificationCollection we already have
+ if not notificationCollection:
+ notificationCollection = self._notificationCollection
+
+ # by default we'll keep our old calendars...
+ newCalendars = {}
+ for href, oldCalendar in self._calendars.iteritems():
+ newCalendars[href] = oldCalendar
+
+ # ...but if a calendar shows up from _extractCalendars we know it's
+ # either new or modified, so replace our old copy with the new
+ for cal in calendars:
+ # print("SYNC DETECTED CHANGE IN", cal.url)
+ newCalendars[cal.url] = cal
+
+ # Now scan through the responses for 404s which let us know a collection
+ # has been removed
+ for responseHref in responseHrefs:
+ if responseHrefs[responseHref].getStatus() == 404:
+ if responseHref in newCalendars:
+ del newCalendars[responseHref]
+ # print("DELETED CALENDAR", responseHref)
+
+ # get the new token
+ newCalendarHomeToken = ""
+ for other in others:
+ if other.tag == davxml.sync_token:
+ newCalendarHomeToken = other.text
+ break
+
+ returnValue((newCalendars.values(), notificationCollection, newCalendarHomeToken))
+
+
+
</ins><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">@@ -899,7 +955,7 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def deepRefresh(self):
</span><del>- calendars, notificationCollection, results = yield self._calendarHomePropfind(self.calendarHomeHref)
</del><ins>+ calendars, notificationCollection, calendarHomeToken, 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">@@ -954,6 +1010,7 @@
</span><span class="cx"> """
</span><span class="cx"> calendars = []
</span><span class="cx"> notificationCollection = None
</span><ins>+ calendarHomeToken = ""
</ins><span class="cx">
</span><span class="cx"> changeTag = davxml.sync_token if self.supportSync else csxml.getctag
</span><span class="cx">
</span><span class="lines">@@ -992,6 +1049,15 @@
</span><span class="cx"> if server and uri:
</span><span class="cx"> self.xmpp[href] = XMPPPush(server, uri, pushkey)
</span><span class="cx">
</span><ins>+ try:
+ calendarHomeToken = text[davxml.sync_token]
+ except KeyError:
+ pass
+
+
+ if results[href].getStatus() == 404:
+ continue
+
</ins><span class="cx"> nodes = results[href].getNodeProperties()
</span><span class="cx"> isCalendar = False
</span><span class="cx"> isNotifications = False
</span><span class="lines">@@ -1044,7 +1110,7 @@
</span><span class="cx"> textProps.get(changeTag, None)
</span><span class="cx"> )
</span><span class="cx">
</span><del>- return calendars, notificationCollection
</del><ins>+ return calendars, notificationCollection, calendarHomeToken
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _updateCalendar(self, calendar, newToken, fetchEvents=True):
</span><span class="lines">@@ -1102,7 +1168,7 @@
</span><span class="cx"> depth='1',
</span><span class="cx"> allowedStatus=(MULTI_STATUS, FORBIDDEN,),
</span><span class="cx"> otherTokens=True,
</span><del>- method_label="REPORT{sync}" if calendar.changeToken else "REPORT{sync-init}",
</del><ins>+ method_label="REPORT{sync-coll}" if calendar.changeToken else "REPORT{sync-coll-init}",
</ins><span class="cx"> )
</span><span class="cx"> if result is None:
</span><span class="cx"> if not fullSync:
</span><span class="lines">@@ -1112,7 +1178,7 @@
</span><span class="cx"> self._POLL_CALENDAR_SYNC_REPORT % {'sync-token': ''},
</span><span class="cx"> depth='1',
</span><span class="cx"> otherTokens=True,
</span><del>- method_label="REPORT{sync}" if calendar.changeToken else "REPORT{sync-init}",
</del><ins>+ method_label="REPORT{sync-coll}" if calendar.changeToken else "REPORT{sync-coll-init}",
</ins><span class="cx"> )
</span><span class="cx"> else:
</span><span class="cx"> raise IncorrectResponseCode((MULTI_STATUS,), None, None)
</span><span class="lines">@@ -1288,7 +1354,7 @@
</span><span class="cx"> depth='1',
</span><span class="cx"> allowedStatus=(MULTI_STATUS, FORBIDDEN,),
</span><span class="cx"> otherTokens=True,
</span><del>- method_label="REPORT{sync}" if oldToken else "REPORT{sync-init}",
</del><ins>+ method_label="REPORT{sync-notif}" if oldToken else "REPORT{sync-notif-init}",
</ins><span class="cx"> )
</span><span class="cx"> if result is None:
</span><span class="cx"> if not fullSync:
</span><span class="lines">@@ -1298,7 +1364,7 @@
</span><span class="cx"> self._NOTIFICATION_SYNC_REPORT % {'sync-token': ''},
</span><span class="cx"> depth='1',
</span><span class="cx"> otherTokens=True,
</span><del>- method_label="REPORT{sync}" if oldToken else "REPORT{sync-init}",
</del><ins>+ method_label="REPORT{sync-notif}" if oldToken else "REPORT{sync-notif-init}",
</ins><span class="cx"> )
</span><span class="cx"> else:
</span><span class="cx"> raise IncorrectResponseCode((MULTI_STATUS,), None, None)
</span><span class="lines">@@ -1400,10 +1466,16 @@
</span><span class="cx"> returnValue(False)
</span><span class="cx"> self._checking.add(calendarHomeSet)
</span><span class="cx">
</span><del>- calendars, notificationCollection, results = yield self._calendarHomePropfind(calendarHomeSet)
</del><ins>+ if not self.calendarHomeToken:
+ calendars, notificationCollection, newCalendarHomeToken, results = yield self._calendarHomePropfind(calendarHomeSet)
+ else:
+ calendars, notificationCollection, newCalendarHomeToken = yield self._calendarHomeSync(calendarHomeSet)
+ results = None
</ins><span class="cx">
</span><ins>+ self.calendarHomeToken = newCalendarHomeToken
+
</ins><span class="cx"> # First time operations
</span><del>- if firstTime:
</del><ins>+ if firstTime and results:
</ins><span class="cx"> yield self._pollFirstTime1(results[calendarHomeSet], calendars)
</span><span class="cx">
</span><span class="cx"> # Normal poll
</span><span class="lines">@@ -1550,7 +1622,7 @@
</span><span class="cx"> type="operation",
</span><span class="cx"> phase="start",
</span><span class="cx"> user=self.record.uid,
</span><del>- client_type=self.title,
</del><ins>+ client_type="({} {})".format(self.title, self._instanceNumber),
</ins><span class="cx"> client_id=self._client_id,
</span><span class="cx"> label=label,
</span><span class="cx"> )
</span><span class="lines">@@ -1573,7 +1645,7 @@
</span><span class="cx"> phase="end",
</span><span class="cx"> duration=after - before,
</span><span class="cx"> user=self.record.uid,
</span><del>- client_type=self.title,
</del><ins>+ client_type="({} {})".format(self.title, self._instanceNumber),
</ins><span class="cx"> client_id=self._client_id,
</span><span class="cx"> label=label,
</span><span class="cx"> success=success,
</span><span class="lines">@@ -1717,6 +1789,8 @@
</span><span class="cx">
</span><span class="cx"> # Create dict for all the data we need to store
</span><span class="cx"> data = {
</span><ins>+ "homeToken": self.calendarHomeToken,
+ "attachmentsUrl": self._managed_attachments_server_url,
</ins><span class="cx"> "principalURL": self.principalURL,
</span><span class="cx"> "calendars": [calendar.serialize() for calendar in sorted(self._calendars.values(), key=lambda x:x.name)],
</span><span class="cx"> "events": [event.serialize() for event in sorted(self._events.values(), key=lambda x:x.url)],
</span><span class="lines">@@ -1749,6 +1823,8 @@
</span><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> self.principalURL = data["principalURL"]
</span><ins>+ self.calendarHomeToken = data["homeToken"].encode("utf-8")
+ self._managed_attachments_server_url = data["attachmentsUrl"].encode("utf-8")
</ins><span class="cx">
</span><span class="cx"> # Extract all the events first, then do the calendars (which reference the events)
</span><span class="cx"> for event in data["events"]:
</span><span class="lines">@@ -2404,6 +2480,7 @@
</span><span class="cx"> _POLL_NOTIFICATION_PROPFIND_D1 = loadRequestBody(_LOAD_PATH, 'poll_notification_depth1_propfind')
</span><span class="cx">
</span><span class="cx"> _NOTIFICATION_SYNC_REPORT = loadRequestBody(_LOAD_PATH, 'notification_sync')
</span><ins>+ _CALENDARHOME_SYNC_REPORT = loadRequestBody(_LOAD_PATH, 'poll_calendarhome_sync')
</ins><span class="cx">
</span><span class="cx"> _USER_LIST_PRINCIPAL_PROPERTY_SEARCH = loadRequestBody('OS_X_10_7', 'user_list_principal_property_search')
</span><span class="cx"> _POST_AVAILABILITY = loadRequestBody('OS_X_10_7', 'post_availability')
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestrequestdataOS_X_10_11poll_calendarhome_syncrequest"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/request-data/OS_X_10_11/poll_calendarhome_sync.request (15647 => 15648)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/request-data/OS_X_10_11/poll_calendarhome_sync.request 2016-06-02 16:41:06 UTC (rev 15647)
+++ CalendarServer/trunk/contrib/performance/loadtest/request-data/OS_X_10_11/poll_calendarhome_sync.request 2016-06-03 03:52:46 UTC (rev 15648)
</span><span class="lines">@@ -1,45 +1,45 @@
</span><span class="cx"> <?xml version="1.0" encoding="UTF-8"?>
</span><span class="cx"> <A:sync-collection xmlns:A="DAV:">
</span><del>- <A:sync-token>data:,30_1122/8bbf7c540e5fca2cc3220f114a8164f7</A:sync-token>
</del><ins>+ <A:sync-token>%(sync-token)s</A:sync-token>
</ins><span class="cx"> <A:sync-level>1</A:sync-level>
</span><span class="cx"> <A:prop>
</span><del>- <C:publish-url xmlns:C="http://calendarserver.org/ns/"/>
- <B:supported-calendar-component-sets xmlns:B="urn:ietf:params:xml:ns:caldav"/>
- <B:schedule-calendar-transp xmlns:B="urn:ietf:params:xml:ns:caldav"/>
</del><ins>+ <A:sync-token/>
+ <A:resourcetype/>
+ <A:displayname/>
+ <B:calendar-free-busy-set xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <B:default-alarm-vevent-date xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <C:allowed-sharing-modes xmlns:C="http://calendarserver.org/ns/"/>
+ <B:calendar-alarm xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <B:calendar-timezone xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <C:push-transports xmlns:C="http://calendarserver.org/ns/"/>
+ <B:supported-calendar-component-set xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <C:subscribed-strip-attachments xmlns:C="http://calendarserver.org/ns/"/>
+ <A:quota-available-bytes/>
+ <B:default-alarm-vevent-datetime xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <A:quota-used-bytes/>
+ <E:location-code xmlns:E="http://apple.com/ns/ical/"/>
+ <A:resource-id/>
+ <C:getctag xmlns:C="http://calendarserver.org/ns/"/>
+ <E:calendar-color xmlns:E="http://apple.com/ns/ical/"/>
</ins><span class="cx"> <C:source xmlns:C="http://calendarserver.org/ns/"/>
</span><del>- <B:calendar-description xmlns:B="urn:ietf:params:xml:ns:caldav"/>
- <D:location-code xmlns:D="http://apple.com/ns/ical/"/>
- <D:autoprovisioned xmlns:D="http://apple.com/ns/ical/"/>
- <A:quota-used-bytes/>
</del><ins>+ <E:autoprovisioned xmlns:E="http://apple.com/ns/ical/"/>
+ <A:current-user-privilege-set/>
</ins><span class="cx"> <C:pre-publish-url xmlns:C="http://calendarserver.org/ns/"/>
</span><del>- <D:calendar-order xmlns:D="http://apple.com/ns/ical/"/>
- <D:refreshrate xmlns:D="http://apple.com/ns/ical/"/>
- <C:subscribed-strip-attachments xmlns:C="http://calendarserver.org/ns/"/>
- <C:push-transports xmlns:C="http://calendarserver.org/ns/"/>
</del><span class="cx"> <B:schedule-default-calendar-URL xmlns:B="urn:ietf:params:xml:ns:caldav"/>
</span><del>- <B:calendar-alarm xmlns:B="urn:ietf:params:xml:ns:caldav"/>
- <B:supported-calendar-component-set xmlns:B="urn:ietf:params:xml:ns:caldav"/>
</del><ins>+ <B:schedule-calendar-transp xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <B:supported-calendar-component-sets xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <D:bulk-requests xmlns:D="http://me.com/_namespace/"/>
+ <E:calendar-order xmlns:E="http://apple.com/ns/ical/"/>
+ <E:refreshrate xmlns:E="http://apple.com/ns/ical/"/>
+ <C:subscribed-strip-todos xmlns:C="http://calendarserver.org/ns/"/>
+ <B:calendar-description xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <E:language-code xmlns:E="http://apple.com/ns/ical/"/>
+ <C:publish-url xmlns:C="http://calendarserver.org/ns/"/>
+ <C:pushkey xmlns:C="http://calendarserver.org/ns/"/>
</ins><span class="cx"> <A:owner/>
</span><ins>+ <A:supported-report-set/>
</ins><span class="cx"> <A:add-member/>
</span><ins>+ <C:subscribed-strip-alarms xmlns:C="http://calendarserver.org/ns/"/>
</ins><span class="cx"> <C:invite xmlns:C="http://calendarserver.org/ns/"/>
</span><del>- <A:resource-id/>
- <E:bulk-requests xmlns:E="http://me.com/_namespace/"/>
- <B:calendar-timezone xmlns:B="urn:ietf:params:xml:ns:caldav"/>
- <A:supported-report-set/>
- <A:displayname/>
- <C:subscribed-strip-alarms xmlns:C="http://calendarserver.org/ns/"/>
- <D:language-code xmlns:D="http://apple.com/ns/ical/"/>
- <C:subscribed-strip-todos xmlns:C="http://calendarserver.org/ns/"/>
- <C:allowed-sharing-modes xmlns:C="http://calendarserver.org/ns/"/>
- <A:current-user-privilege-set/>
- <B:calendar-free-busy-set xmlns:B="urn:ietf:params:xml:ns:caldav"/>
- <A:sync-token/>
- <A:quota-available-bytes/>
- <C:pushkey xmlns:C="http://calendarserver.org/ns/"/>
- <B:default-alarm-vevent-date xmlns:B="urn:ietf:params:xml:ns:caldav"/>
- <A:resourcetype/>
- <B:default-alarm-vevent-datetime xmlns:B="urn:ietf:params:xml:ns:caldav"/>
- <D:calendar-color xmlns:D="http://apple.com/ns/ical/"/>
- <C:getctag xmlns:C="http://calendarserver.org/ns/"/>
</del><span class="cx"> </A:prop>
</span><span class="cx"> </A:sync-collection>
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_icalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_ical.py (15647 => 15648)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_ical.py 2016-06-02 16:41:06 UTC (rev 15647)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_ical.py 2016-06-03 03:52:46 UTC (rev 15648)
</span><span class="lines">@@ -1177,6 +1177,7 @@
</span><span class="cx"> serializePath,
</span><span class="cx"> self.record,
</span><span class="cx"> None,
</span><ins>+ 1
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1241,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 = self.client._extractCalendars(
</del><ins>+ calendars, notificationCollection, 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 class="lines">@@ -1558,6 +1559,9 @@
</span><span class="cx">
</span><span class="cx"> self.client._notificationCollection = NotificationCollection("/home/notification", "123")
</span><span class="cx">
</span><ins>+ self.client._managed_attachments_server_url = "attachmentsurl"
+ self.client.calendarHomeToken = "hometoken"
+
</ins><span class="cx"> self.client.serialize()
</span><span class="cx"> self.assertTrue(os.path.exists(clientPath))
</span><span class="cx"> self.assertTrue(os.path.exists(indexPath))
</span><span class="lines">@@ -1626,6 +1630,8 @@
</span><span class="cx"> }
</span><span class="cx"> ],
</span><span class="cx"> "principalURL": null,
</span><ins>+ "homeToken": "hometoken",
+ "attachmentsUrl": "attachmentsurl",
</ins><span class="cx"> "events": [
</span><span class="cx"> {
</span><span class="cx"> "url": "/home/calendar/1.ics",
</span><span class="lines">@@ -1699,6 +1705,8 @@
</span><span class="cx"> "calendars": [
</span><span class="cx"> {
</span><span class="cx"> "changeToken": "321",
</span><ins>+ "homeToken": "321",
+ "attachmentsUrl": "https://example.com/attachments/",
</ins><span class="cx"> "name": "calendar",
</span><span class="cx"> "shared": false,
</span><span class="cx"> "sharedByMe": false,
</span><span class="lines">@@ -1740,6 +1748,8 @@
</span><span class="cx"> }
</span><span class="cx"> ],
</span><span class="cx"> "principalURL": null,
</span><ins>+ "homeToken": "hometoken",
+ "attachmentsUrl": "attachmentsurl",
</ins><span class="cx"> "events": [
</span><span class="cx"> {
</span><span class="cx"> "url": "/home/calendar/2.ics",
</span><span class="lines">@@ -1787,6 +1797,8 @@
</span><span class="cx"> self.assertEqual(self.client._events["/home/inbox/i2.ics"].etag, "987.987")
</span><span class="cx"> self.assertEqual(self.client._events["/home/inbox/i2.ics"].getUID(), "00a79cad-857b-418e-a54a-340b5686d747")
</span><span class="cx"> self.assertEqual(str(self.client._events["/home/inbox/i2.ics"].component), cal2)
</span><ins>+ self.assertEqual(self.client.calendarHomeToken, "hometoken")
+ self.assertEqual(self.client._managed_attachments_server_url, "attachmentsurl")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_profilespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py (15647 => 15648)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py 2016-06-02 16:41:06 UTC (rev 15647)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py 2016-06-03 03:52:46 UTC (rev 15648)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> return succeed(None)
</span><span class="cx">
</span><span class="cx">
</span><del>- def addInvite(self, href, vevent, attachmentSize=0):
</del><ins>+ def addInvite(self, href, vevent, attachmentSize=0, lookupPercentage=0):
</ins><span class="cx"> return self.addEvent(href, vevent, attachmentSize=attachmentSize)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_simpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_sim.py (15647 => 15648)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_sim.py 2016-06-02 16:41:06 UTC (rev 15647)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_sim.py 2016-06-03 03:52:46 UTC (rev 15648)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> profiles are not logged.
</span><span class="cx"> """
</span><span class="cx"> class BrokenClient(object):
</span><del>- def __init__(self, reactor, serverAddress, principalPathTemplate, serializationPath, userInfo, auth, runResult):
</del><ins>+ def __init__(self, reactor, serverAddress, principalPathTemplate, serializationPath, userInfo, auth, instanceNumber, runResult):
</ins><span class="cx"> self._runResult = runResult
</span><span class="cx">
</span><span class="cx"> def run(self):
</span></span></pre>
</div>
</div>
</body>
</html>