[CalendarServer-changes] [8431] CalendarServer/trunk/contrib/performance/loadtest

source_changes at macosforge.org source_changes at macosforge.org
Mon Dec 12 20:16:02 PST 2011


Revision: 8431
          http://trac.macosforge.org/projects/calendarserver/changeset/8431
Author:   cdaboo at apple.com
Date:     2011-12-12 20:16:01 -0800 (Mon, 12 Dec 2011)
Log Message:
-----------
Missed from last commit.

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/loadtest/test_ical.py
    CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py

Modified: CalendarServer/trunk/contrib/performance/loadtest/test_ical.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/test_ical.py	2011-12-13 01:16:36 UTC (rev 8430)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_ical.py	2011-12-13 04:16:01 UTC (rev 8431)
@@ -1148,7 +1148,7 @@
         """
         requests = self.interceptRequests()
 
-        calendar = Calendar(caldavxml.calendar, u'calendar', u'/mumble/', None)
+        calendar = Calendar(caldavxml.calendar, set(('VEVENT',)), u'calendar', u'/mumble/', None)
         self.client._calendars[calendar.url] = calendar
 
         vcalendar = Component.fromString(EVENT)
@@ -1190,7 +1190,7 @@
         """
         requests = self.interceptRequests()
 
-        calendar = Calendar(caldavxml.calendar, u'calendar', u'/foo/', None)
+        calendar = Calendar(caldavxml.calendar, set(('VEVENT',)), u'calendar', u'/foo/', None)
         event = Event(calendar.url + u'bar.ics', None)
         self.client._calendars[calendar.url] = calendar
         self.client._setEvent(event.url, event)
@@ -1351,7 +1351,7 @@
         """
         requests = self.interceptRequests()
 
-        calendar = Calendar(None, 'calendar', '/something/', None)
+        calendar = Calendar(None, set(('VEVENT',)), 'calendar', '/something/', None)
         self.client._calendars[calendar.url] = calendar
         self.client._updateCalendar(calendar)
         result, req = requests.pop(0)
@@ -1394,7 +1394,7 @@
 
         self.patch(self.client, "MULTIGET_BATCH_SIZE", 1)
 
-        calendar = Calendar(None, 'calendar', '/something/', None)
+        calendar = Calendar(None, set(('VEVENT',)), 'calendar', '/something/', None)
         self.client._calendars[calendar.url] = calendar
         self.client._updateCalendar(calendar)
         result, req = requests.pop(0)

Modified: CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py	2011-12-13 01:16:36 UTC (rev 8430)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py	2011-12-13 04:16:01 UTC (rev 8431)
@@ -265,7 +265,7 @@
     def _simpleAccount(self, userNumber, eventText):
         vevent = Component.fromString(eventText)
         calendar = Calendar(
-            caldavxml.calendar, u'calendar', u'/cal/', None)
+            caldavxml.calendar, set(('VEVENT',)), u'calendar', u'/cal/', None)
         event = Event(calendar.url + u'1234.ics', None, vevent)
         calendar.events = {u'1234.ics': event}
         client = StubClient(userNumber)
@@ -490,7 +490,7 @@
         userNumber = 14
         calendarURL = '/some/calendar/'
         calendar = Calendar(
-            csxml.dropbox_home, u'notification', calendarURL, None)
+            csxml.dropbox_home, set(), u'notification', calendarURL, None)
         client = StubClient(userNumber)
         client._calendars[calendarURL] = calendar
         accepter = Accepter(None, self.sim, client, userNumber)
@@ -507,7 +507,7 @@
         userNumber = int(attendees[1].parameterValue('CN').split(None, 1)[1])
         calendarURL = '/some/calendar/'
         calendar = Calendar(
-            caldavxml.calendar, u'calendar', calendarURL, None)
+            caldavxml.calendar, set(('VEVENT',)), u'calendar', calendarURL, None)
         client = StubClient(userNumber)
         client._calendars[calendarURL] = calendar
         event = Event(calendarURL + u'1234.ics', None, vevent)
@@ -530,7 +530,7 @@
         userNumber = int(attendees[1].parameterValue('CN').split(None, 1)[1])
         calendarURL = '/some/calendar/'
         calendar = Calendar(
-            caldavxml.calendar, u'calendar', calendarURL, None)
+            caldavxml.calendar, set(('VEVENT',)), u'calendar', calendarURL, None)
         client = StubClient(userNumber)
         client._calendars[calendarURL] = calendar
         event = Event(calendarURL + u'1234.ics', None, vevent)
@@ -559,12 +559,12 @@
 
         calendarURL = '/some/calendar/'
         calendar = Calendar(
-            caldavxml.calendar, u'calendar', calendarURL, None)
+            caldavxml.calendar, set(('VEVENT',)), u'calendar', calendarURL, None)
         client._calendars[calendarURL] = calendar
 
         inboxURL = '/some/inbox/'
         inbox = Calendar(
-            caldavxml.schedule_inbox, u'the inbox', inboxURL, None)
+            caldavxml.schedule_inbox, set(), u'the inbox', inboxURL, None)
         client._calendars[inboxURL] = inbox
 
         event = Event(calendarURL + u'1234.ics', None, vevent)
@@ -604,7 +604,7 @@
         userNumber = int(attendees[1].parameterValue('CN').split(None, 1)[1])
         calendarURL = '/some/calendar/'
         calendar = Calendar(
-            caldavxml.calendar, u'calendar', calendarURL, None)
+            caldavxml.calendar, set(('VEVENT',)), u'calendar', calendarURL, None)
         client = StubClient(userNumber)
         client._calendars[calendarURL] = calendar
         event = Event(calendarURL + u'1234.ics', None, vevent)
@@ -645,7 +645,7 @@
 
         calendarURL = '/some/calendar/'
         calendar = Calendar(
-            caldavxml.calendar, u'calendar', calendarURL, None)
+            caldavxml.calendar, set(('VEVENT',)), u'calendar', calendarURL, None)
         client._calendars[calendarURL] = calendar
 
         vevent = Component.fromString(INVITED_EVENT)
@@ -690,7 +690,7 @@
         to add events on it.
         """
         calendar = Calendar(
-            caldavxml.schedule_inbox, u'inbox', u'/sched/inbox', None)
+            caldavxml.schedule_inbox, set(), u'inbox', u'/sched/inbox', None)
         client = StubClient(21)
         client._calendars.update({calendar.url: calendar})
 
@@ -706,7 +706,7 @@
         L{Eventer._addEvent} adds an event to it.
         """
         calendar = Calendar(
-            caldavxml.calendar, u'personal stuff', u'/cals/personal', None)
+            caldavxml.calendar, set(('VEVENT',)), u'personal stuff', u'/cals/personal', None)
         client = StubClient(31)
         client._calendars.update({calendar.url: calendar})
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111212/c3f4a706/attachment-0001.html>


More information about the calendarserver-changes mailing list