<!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>[15438] CalendarServer/trunk/simplugin</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/15438">15438</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2016-01-14 14:00:31 -0800 (Thu, 14 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sim's client _get( ) moved up to base class.
<clients> in clients.plist need enabled=true now.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunksimplugincaldavclientpy">CalendarServer/trunk/simplugin/caldavclient.py</a></li>
<li><a href="#CalendarServertrunksimplugincaldavprofilepy">CalendarServer/trunk/simplugin/caldavprofile.py</a></li>
<li><a href="#CalendarServertrunksimpluginclientsplist">CalendarServer/trunk/simplugin/clients.plist</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunksimplugincaldavclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/simplugin/caldavclient.py (15437 => 15438)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/simplugin/caldavclient.py 2016-01-11 21:20:37 UTC (rev 15437)
+++ CalendarServer/trunk/simplugin/caldavclient.py 2016-01-14 22:00:31 UTC (rev 15438)
</span><span class="lines">@@ -521,22 +521,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def _get(self, url, allowedStatus=(MULTI_STATUS,), method_label=None):
- """
- Issue a GET on the chosen URL
- """
- response = yield self._request(
- allowedStatus,
- 'GET',
- url,
- method_label=method_label,
- )
-
- body = yield readBody(response)
- returnValue(body)
-
-
- @inlineCallbacks
</del><span class="cx"> def _report(self, url, body, depth='0', allowedStatus=(MULTI_STATUS,), otherTokens=False, method_label=None):
</span><span class="cx"> """
</span><span class="cx"> Issue a REPORT on the chosen URL
</span></span></pre></div>
<a id="CalendarServertrunksimplugincaldavprofilepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/simplugin/caldavprofile.py (15437 => 15438)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/simplugin/caldavprofile.py 2016-01-11 21:20:37 UTC (rev 15437)
+++ CalendarServer/trunk/simplugin/caldavprofile.py 2016-01-14 22:00:31 UTC (rev 15438)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> from clientsim.framework.stats import LogNormalDistribution, RecurrenceDistribution
</span><span class="cx"> from clientsim.framework.logger import SummarizingMixin
</span><span class="cx"> from clientsim.framework.baseclient import IncorrectResponseCode
</span><del>-from clientsim.framework.baseprofile import ProfileBase as SuperProfileBase, loopWithDistribution
</del><ins>+from clientsim.framework.baseprofile import BaseProfile as SuperBaseProfile, loopWithDistribution
</ins><span class="cx"> from simplugin.caldavclient import Calendar
</span><span class="cx">
</span><span class="cx"> from pycalendar.datetime import DateTime
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> from datetime import datetime
</span><span class="cx">
</span><del>-class ProfileBase(SuperProfileBase):
</del><ins>+class BaseProfile(SuperBaseProfile):
</ins><span class="cx">
</span><span class="cx"> def _calendarsOfType(self, calendarType, componentType, justOwned=False):
</span><span class="cx"> results = []
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class Inviter(ProfileBase):
</del><ins>+class Inviter(BaseProfile):
</ins><span class="cx"> """
</span><span class="cx"> A Calendar user who invites other users to new events.
</span><span class="cx"> """
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class Accepter(ProfileBase):
</del><ins>+class Accepter(BaseProfile):
</ins><span class="cx"> """
</span><span class="cx"> A Calendar user who accepts invitations to events. As well as accepting requests, this
</span><span class="cx"> will also remove cancels and replies.
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class AttachmentDownloader(ProfileBase):
</del><ins>+class AttachmentDownloader(BaseProfile):
</ins><span class="cx"> """
</span><span class="cx"> A Calendar user who downloads attachments.
</span><span class="cx"> """
</span><span class="lines">@@ -525,7 +525,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class Eventer(ProfileBase):
</del><ins>+class Eventer(BaseProfile):
</ins><span class="cx"> """
</span><span class="cx"> A Calendar user who creates new events.
</span><span class="cx"> """
</span><span class="lines">@@ -606,7 +606,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class EventUpdaterBase(ProfileBase):
</del><ins>+class EventUpdaterBase(BaseProfile):
</ins><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def action(self):
</span><span class="lines">@@ -735,7 +735,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class CalendarSharer(ProfileBase):
</del><ins>+class CalendarSharer(BaseProfile):
</ins><span class="cx"> """
</span><span class="cx"> A Calendar user who shares calendars to other random users.
</span><span class="cx"> """
</span><span class="lines">@@ -787,7 +787,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class AlarmAcknowledger(ProfileBase):
</del><ins>+class AlarmAcknowledger(BaseProfile):
</ins><span class="cx"> """
</span><span class="cx"> A Calendar user who creates a new event, and then updates its alarm.
</span><span class="cx"> """
</span><span class="lines">@@ -937,7 +937,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class Tasker(ProfileBase):
</del><ins>+class Tasker(BaseProfile):
</ins><span class="cx"> """
</span><span class="cx"> A Calendar user who creates new tasks.
</span><span class="cx"> """
</span><span class="lines">@@ -1001,7 +1001,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class Resetter(ProfileBase):
</del><ins>+class Resetter(BaseProfile):
</ins><span class="cx"> """
</span><span class="cx"> A Calendar user who resets their account and re-downloads everything.
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunksimpluginclientsplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/simplugin/clients.plist (15437 => 15438)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/simplugin/clients.plist 2016-01-11 21:20:37 UTC (rev 15437)
+++ CalendarServer/trunk/simplugin/clients.plist 2016-01-14 22:00:31 UTC (rev 15438)
</span><span class="lines">@@ -33,6 +33,9 @@
</span><span class="cx"> <key>software</key>
</span><span class="cx"> <string>simplugin.caldavclient.OS_X_10_11</string>
</span><span class="cx">
</span><ins>+ <key>enabled</key>
+ <true/>
+
</ins><span class="cx"> <!-- Arguments to use to initialize the OS_X_10_11 instance. -->
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span></span></pre>
</div>
</div>
</body>
</html>