[CalendarServer-changes] [15438] CalendarServer/trunk/simplugin

[source_changes at macosforge.org]

Revision: 15438
          http://trac.calendarserver.org//changeset/15438
Author:   sagen at apple.com
Date:     2016-01-14 14:00:31 -0800 (Thu, 14 Jan 2016)
Log Message:
-----------
Sim's client _get( ) moved up to base class.
<clients> in clients.plist need enabled=true now.

Modified Paths:
--------------
    CalendarServer/trunk/simplugin/caldavclient.py
    CalendarServer/trunk/simplugin/caldavprofile.py
    CalendarServer/trunk/simplugin/clients.plist

Modified: CalendarServer/trunk/simplugin/caldavclient.py
===================================================================
--- 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)
@@ -521,22 +521,6 @@
 
 
     @inlineCallbacks
-    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
     def _report(self, url, body, depth='0', allowedStatus=(MULTI_STATUS,), otherTokens=False, method_label=None):
         """
         Issue a REPORT on the chosen URL

Modified: CalendarServer/trunk/simplugin/caldavprofile.py
===================================================================
--- 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)
@@ -40,7 +40,7 @@
 from clientsim.framework.stats import LogNormalDistribution, RecurrenceDistribution
 from clientsim.framework.logger import SummarizingMixin
 from clientsim.framework.baseclient import IncorrectResponseCode
-from clientsim.framework.baseprofile import ProfileBase as SuperProfileBase, loopWithDistribution
+from clientsim.framework.baseprofile import BaseProfile as SuperBaseProfile, loopWithDistribution
 from simplugin.caldavclient import Calendar
 
 from pycalendar.datetime import DateTime
@@ -48,7 +48,7 @@
 
 from datetime import datetime
 
-class ProfileBase(SuperProfileBase):
+class BaseProfile(SuperBaseProfile):
 
     def _calendarsOfType(self, calendarType, componentType, justOwned=False):
         results = []
@@ -181,7 +181,7 @@
 
 
 
-class Inviter(ProfileBase):
+class Inviter(BaseProfile):
     """
     A Calendar user who invites other users to new events.
     """
@@ -332,7 +332,7 @@
 
 
 
-class Accepter(ProfileBase):
+class Accepter(BaseProfile):
     """
     A Calendar user who accepts invitations to events. As well as accepting requests, this
     will also remove cancels and replies.
@@ -484,7 +484,7 @@
 
 
 
-class AttachmentDownloader(ProfileBase):
+class AttachmentDownloader(BaseProfile):
     """
     A Calendar user who downloads attachments.
     """
@@ -525,7 +525,7 @@
 
 
 
-class Eventer(ProfileBase):
+class Eventer(BaseProfile):
     """
     A Calendar user who creates new events.
     """
@@ -606,7 +606,7 @@
 
 
 
-class EventUpdaterBase(ProfileBase):
+class EventUpdaterBase(BaseProfile):
 
     @inlineCallbacks
     def action(self):
@@ -735,7 +735,7 @@
 
 
 
-class CalendarSharer(ProfileBase):
+class CalendarSharer(BaseProfile):
     """
     A Calendar user who shares calendars to other random users.
     """
@@ -787,7 +787,7 @@
 
 
 
-class AlarmAcknowledger(ProfileBase):
+class AlarmAcknowledger(BaseProfile):
     """
     A Calendar user who creates a new event, and then updates its alarm.
     """
@@ -937,7 +937,7 @@
 
 
 
-class Tasker(ProfileBase):
+class Tasker(BaseProfile):
     """
     A Calendar user who creates new tasks.
     """
@@ -1001,7 +1001,7 @@
 
 
 
-class Resetter(ProfileBase):
+class Resetter(BaseProfile):
     """
     A Calendar user who resets their account and re-downloads everything.
     """

Modified: CalendarServer/trunk/simplugin/clients.plist
===================================================================
--- 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)
@@ -33,6 +33,9 @@
 				<key>software</key>
 				<string>simplugin.caldavclient.OS_X_10_11</string>
 
+				<key>enabled</key>
+				<true/>
+
 				<!-- Arguments to use to initialize the OS_X_10_11 instance. -->
 				<key>params</key>
 				<dict>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160114/82033d7b/attachment.html>