<!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>[13781] 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/13781">13781</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-07-21 19:16:13 -0700 (Mon, 21 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix sim tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadtestsimpy">CalendarServer/trunk/contrib/performance/loadtest/sim.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="#CalendarServertrunkcontribperformanceloadtesttest_simpy">CalendarServer/trunk/contrib/performance/loadtest/test_sim.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcontribperformanceloadtestsimpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/sim.py (13780 => 13781)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/sim.py 2014-07-21 19:30:59 UTC (rev 13780)
+++ CalendarServer/trunk/contrib/performance/loadtest/sim.py 2014-07-22 02:16:13 UTC (rev 13781)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> from contrib.performance.loadtest.webadmin import LoadSimAdminResource
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class _DirectoryRecord(object):
</span><span class="cx"> def __init__(self, uid, password, commonName, email, guid):
</span><span class="cx"> self.uid = uid
</span><span class="lines">@@ -68,15 +69,19 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def generateRecords(count, uidPattern="user%d", passwordPattern="user%d",
- namePattern="User %d", emailPattern="user%d@example.com"):
</del><ins>+def generateRecords(
+ count, uidPattern="user%d", passwordPattern="user%d",
+ namePattern="User %d", emailPattern="user%d@example.com",
+ guidPattern="user%d"
+):
</ins><span class="cx"> for i in xrange(count):
</span><span class="cx"> i += 1
</span><span class="cx"> uid = uidPattern % (i,)
</span><span class="cx"> password = passwordPattern % (i,)
</span><span class="cx"> name = namePattern % (i,)
</span><span class="cx"> email = emailPattern % (i,)
</span><del>- yield _DirectoryRecord(uid, password, name, email)
</del><ins>+ guid = guidPattern % (i,)
+ yield _DirectoryRecord(uid, password, name, email, guid)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -151,7 +156,7 @@
</span><span class="cx"> ("clients", None, _defaultClients,
</span><span class="cx"> "Configuration plist file name from which to read client parameters.",
</span><span class="cx"> FilePath),
</span><del>- ]
</del><ins>+ ]
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def opt_logfile(self, filename):
</span><span class="lines">@@ -194,7 +199,7 @@
</span><span class="cx"> configFile = self['config'].open()
</span><span class="cx"> except IOError, e:
</span><span class="cx"> raise UsageError("--config %s: %s" % (
</span><del>- self['config'].path, e.strerror))
</del><ins>+ self['config'].path, e.strerror))
</ins><span class="cx"> try:
</span><span class="cx"> try:
</span><span class="cx"> self.config = readPlist(configFile)
</span><span class="lines">@@ -207,7 +212,7 @@
</span><span class="cx"> clientFile = self['clients'].open()
</span><span class="cx"> except IOError, e:
</span><span class="cx"> raise UsageError("--clients %s: %s" % (
</span><del>- self['clients'].path, e.strerror))
</del><ins>+ self['clients'].path, e.strerror))
</ins><span class="cx"> try:
</span><span class="cx"> try:
</span><span class="cx"> client_config = readPlist(clientFile)
</span><span class="lines">@@ -327,8 +332,8 @@
</span><span class="cx"> namedAny(clientConfig["software"]),
</span><span class="cx"> cls._convertParams(clientConfig["params"]),
</span><span class="cx"> [ProfileType(
</span><del>- namedAny(profile["class"]),
- cls._convertParams(profile["params"]))
</del><ins>+ namedAny(profile["class"]),
+ cls._convertParams(profile["params"]))
</ins><span class="cx"> for profile in clientConfig["profiles"]]))
</span><span class="cx"> if not parameters.clients:
</span><span class="cx"> parameters.addClient(1,
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_icalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_ical.py (13780 => 13781)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_ical.py 2014-07-21 19:30:59 UTC (rev 13780)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_ical.py 2014-07-22 02:16:13 UTC (rev 13781)
</span><span class="lines">@@ -403,6 +403,7 @@
</span><span class="cx"> """.replace("\n", "\r\n") % {'UID': EVENT_UID}
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class EventTests(TestCase):
</span><span class="cx"> """
</span><span class="cx"> Tests for L{Event}.
</span><span class="lines">@@ -1122,17 +1123,18 @@
</span><span class="cx"> "xmpp": """\
</span><span class="cx"> <xmpp-server xmlns='http://calendarserver.org/ns/'/>
</span><span class="cx"> <xmpp-uri xmlns='http://calendarserver.org/ns/'/>""",
</span><del>- }
</del><ins>+}
</ins><span class="cx">
</span><span class="cx"> CALENDAR_HOME_PROPFIND_RESPONSE_WITH_XMPP = _CALENDAR_HOME_PROPFIND_RESPONSE_TEMPLATE % {
</span><span class="cx"> "xmpp": """\
</span><span class="cx"> <xmpp-server xmlns='http://calendarserver.org/ns/'>xmpp.example.invalid:1952</xmpp-server>
</span><span class="cx"> <xmpp-uri xmlns='http://calendarserver.org/ns/'>xmpp:pubsub.xmpp.example.invalid?pubsub;node=/CalDAV/another.example.invalid/user01/</xmpp-uri>""",
</span><del>- }
</del><ins>+}
</ins><span class="cx">
</span><span class="cx"> CALENDAR_HOME_PROPFIND_RESPONSE_XMPP_MISSING = _CALENDAR_HOME_PROPFIND_RESPONSE_TEMPLATE % {"xmpp": ""}
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class MemoryResponse(object):
</span><span class="cx"> def __init__(self, version, code, phrase, headers, bodyProducer):
</span><span class="cx"> self.version = version
</span><span class="lines">@@ -1157,7 +1159,8 @@
</span><span class="cx"> def setUp(self):
</span><span class="cx"> TimezoneCache.create()
</span><span class="cx"> self.record = _DirectoryRecord(
</span><del>- u"user91", u"user91", u"User 91", u"user91@example.org")
</del><ins>+ u"user91", u"user91", u"User 91", u"user91@example.org", u"user91",
+ )
</ins><span class="cx"> serializePath = self.mktemp()
</span><span class="cx"> os.mkdir(serializePath)
</span><span class="cx"> self.client = OS_X_10_6(
</span><span class="lines">@@ -1196,18 +1199,20 @@
</span><span class="cx"> principal = principals['/principals/__uids__/user01/']
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> principal.getHrefProperties(),
</span><del>- {davxml.principal_collection_set: URL(path='/principals/'),
- caldavxml.calendar_home_set: URL(path='/calendars/__uids__/user01'),
- caldavxml.calendar_user_address_set: (
</del><ins>+ {
+ davxml.principal_collection_set: URL(path='/principals/'),
+ caldavxml.calendar_home_set: URL(path='/calendars/__uids__/user01'),
+ caldavxml.calendar_user_address_set: (
</ins><span class="cx"> URL(path='/principals/__uids__/user01/'),
</span><span class="cx"> URL(path='/principals/users/user01/'),
</span><del>- ),
- caldavxml.schedule_inbox_URL: URL(path='/calendars/__uids__/user01/inbox/'),
- caldavxml.schedule_outbox_URL: URL(path='/calendars/__uids__/user01/outbox/'),
- csxml.dropbox_home_URL: URL(path='/calendars/__uids__/user01/dropbox/'),
- csxml.notification_URL: URL(path='/calendars/__uids__/user01/notification/'),
- davxml.principal_URL: URL(path='/principals/__uids__/user01/'),
- })
</del><ins>+ ),
+ caldavxml.schedule_inbox_URL: URL(path='/calendars/__uids__/user01/inbox/'),
+ caldavxml.schedule_outbox_URL: URL(path='/calendars/__uids__/user01/outbox/'),
+ csxml.dropbox_home_URL: URL(path='/calendars/__uids__/user01/dropbox/'),
+ csxml.notification_URL: URL(path='/calendars/__uids__/user01/notification/'),
+ davxml.principal_URL: URL(path='/principals/__uids__/user01/'),
+ }
+ )
</ins><span class="cx"> self.assertEquals(
</span><span class="cx"> principal.getTextProperties(),
</span><span class="cx"> {davxml.displayname: 'User 01'})
</span><span class="lines">@@ -1258,12 +1263,13 @@
</span><span class="cx"> home
</span><span class="cx"> )
</span><span class="cx"> self.assertEqual({
</span><del>- home: XMPPPush(
- "xmpp.example.invalid:1952",
- "xmpp:pubsub.xmpp.example.invalid?pubsub;node=/CalDAV/another.example.invalid/user01/",
- "/Some/Unique/Value"
- )},
- self.client.xmpp)
</del><ins>+ home: XMPPPush(
+ "xmpp.example.invalid:1952",
+ "xmpp:pubsub.xmpp.example.invalid?pubsub;node=/CalDAV/another.example.invalid/user01/",
+ "/Some/Unique/Value"
+ )},
+ self.client.xmpp
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_handleMissingXMPP(self):
</span><span class="lines">@@ -1982,9 +1988,7 @@
</span><span class="cx"> uid = vevent.resourceUID()
</span><span class="cx"> dtstamp = vevent.mainComponent().propertyValue("DTSTAMP")
</span><span class="cx"> dtstamp = dtstamp.getText()
</span><del>- self.assertEqual(
-"""\
-BEGIN:VCALENDAR
</del><ins>+ self.assertEqual("""BEGIN:VCALENDAR
</ins><span class="cx"> CALSCALE:GREGORIAN
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> METHOD:REQUEST
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_profilespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py (13780 => 13781)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py 2014-07-21 19:30:59 UTC (rev 13780)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py 2014-07-22 02:16:13 UTC (rev 13781)
</span><span class="lines">@@ -170,6 +170,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class AnyUser(object):
</span><span class="cx"> def __getitem__(self, index):
</span><span class="cx"> return _AnyRecord(index)
</span><span class="lines">@@ -182,6 +183,7 @@
</span><span class="cx"> self.password = u"user%02d" % (index,)
</span><span class="cx"> self.commonName = u"User %02d" % (index,)
</span><span class="cx"> self.email = u"user%02d@example.com" % (index,)
</span><ins>+ self.guid = u"user%02d" % (index,)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -225,7 +227,8 @@
</span><span class="cx"> self._pendingFailures = {}
</span><span class="cx"> self.record = _DirectoryRecord(
</span><span class="cx"> "user%02d" % (number,), "user%02d" % (number,),
</span><del>- "User %02d" % (number,), "user%02d@example.org" % (number,))
</del><ins>+ "User %02d" % (number,), "user%02d@example.org" % (number,),
+ "user%02d" % (number,))
</ins><span class="cx"> self.email = "mailto:user%02d@example.com" % (number,)
</span><span class="cx"> self.uuid = "urn:uuid:user%02d" % (number,)
</span><span class="cx"> self.rescheduled = set()
</span><span class="lines">@@ -290,10 +293,11 @@
</span><span class="cx"> def changeEventAttendee(self, href, old, new):
</span><span class="cx"> if href in self.rescheduled:
</span><span class="cx"> return fail(IncorrectResponseCode(
</span><del>- NO_CONTENT,
- Response(
- ('HTTP', 1, 1), PRECONDITION_FAILED,
- 'Precondition Failed', None, None)))
</del><ins>+ NO_CONTENT,
+ Response(
+ ('HTTP', 1, 1), PRECONDITION_FAILED,
+ 'Precondition Failed', None, None))
+ )
</ins><span class="cx">
</span><span class="cx"> vevent = self._events[href].component
</span><span class="cx"> vevent.mainComponent().removeProperty(old)
</span><span class="lines">@@ -791,7 +795,10 @@
</span><span class="cx"> client._events[event.url] = event
</span><span class="cx"> accepter = Accepter(clock, self.sim, client, userNumber)
</span><span class="cx"> accepter.random = Deterministic()
</span><del>- accepter.random.gauss = lambda mu, sigma: randomDelay
</del><ins>+
+ def _gauss(mu, sigma):
+ return randomDelay
+ accepter.random.gauss = _gauss
</ins><span class="cx"> accepter.eventChanged(event.url)
</span><span class="cx"> accepter.eventChanged(event.url)
</span><span class="cx"> clock.advance(randomDelay)
</span><span class="lines">@@ -838,10 +845,11 @@
</span><span class="cx"> inboxEvent = Event(client.serializeLocation(), inboxURL + u'4321.ics', None, vevent)
</span><span class="cx"> client._setEvent(inboxEvent.url, inboxEvent)
</span><span class="cx"> client._failDeleteWithObject(inboxEvent.url, IncorrectResponseCode(
</span><del>- NO_CONTENT,
- Response(
- ('HTTP', 1, 1), PRECONDITION_FAILED,
- 'Precondition Failed', None, None)))
</del><ins>+ NO_CONTENT,
+ Response(
+ ('HTTP', 1, 1), PRECONDITION_FAILED,
+ 'Precondition Failed', None, None))
+ )
</ins><span class="cx"> accepter = Accepter(clock, self.sim, client, userNumber)
</span><span class="cx"> accepter.eventChanged(inboxEvent.url)
</span><span class="cx"> clock.advance(3)
</span><span class="lines">@@ -1035,11 +1043,13 @@
</span><span class="cx"> """
</span><span class="cx"> logger = OperationLogger(outfile=StringIO())
</span><span class="cx"> logger.observe(dict(
</span><del>- type='operation', phase='start', user='user01',
- label='testing', lag=0.5))
</del><ins>+ type='operation', phase='start', user='user01',
+ label='testing', lag=0.5)
+ )
</ins><span class="cx"> logger.observe(dict(
</span><del>- type='operation', phase='end', user='user01',
- duration=0.35, label='testing', success=True))
</del><ins>+ type='operation', phase='end', user='user01',
+ duration=0.35, label='testing', success=True)
+ )
</ins><span class="cx"> self.assertEqual([], logger.failures())
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1052,8 +1062,9 @@
</span><span class="cx"> logger = OperationLogger(outfile=StringIO())
</span><span class="cx"> for lag in [100.0, 1100.0, 1200.0]:
</span><span class="cx"> logger.observe(dict(
</span><del>- type='operation', phase='start', user='user01',
- label='testing', lag=lag))
</del><ins>+ type='operation', phase='start', user='user01',
+ label='testing', lag=lag)
+ )
</ins><span class="cx"> self.assertEqual(
</span><span class="cx"> ["Median TESTING scheduling lag greater than 1000.0ms"],
</span><span class="cx"> logger.failures())
</span><span class="lines">@@ -1068,11 +1079,13 @@
</span><span class="cx"> logger = OperationLogger(outfile=StringIO())
</span><span class="cx"> for _ignore in range(98):
</span><span class="cx"> logger.observe(dict(
</span><del>- type='operation', phase='end', user='user01',
- duration=0.25, label='testing', success=True))
</del><ins>+ type='operation', phase='end', user='user01',
+ duration=0.25, label='testing', success=True)
+ )
</ins><span class="cx"> logger.observe(dict(
</span><del>- type='operation', phase='end', user='user01',
- duration=0.25, label='testing', success=False))
</del><ins>+ type='operation', phase='end', user='user01',
+ duration=0.25, label='testing', success=False)
+ )
</ins><span class="cx"> self.assertEqual(
</span><span class="cx"> ["Greater than 1% TESTING failed"],
</span><span class="cx"> logger.failures())
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_simpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_sim.py (13780 => 13781)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_sim.py 2014-07-21 19:30:59 UTC (rev 13780)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_sim.py 2014-07-22 02:16:13 UTC (rev 13781)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> VALID_CONFIG_PLIST = writePlistToString(VALID_CONFIG)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class SimOptionsTests(TestCase):
</span><span class="cx"> def test_defaultConfig(self):
</span><span class="cx"> """
</span><span class="lines">@@ -108,7 +109,7 @@
</span><span class="cx"> def _user(self, name):
</span><span class="cx"> password = 'password-' + name
</span><span class="cx"> email = name + "@example.com"
</span><del>- record = _DirectoryRecord(name, password, name, email)
</del><ins>+ record = _DirectoryRecord(name, password, name, email, name)
</ins><span class="cx"> return record
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -283,7 +284,7 @@
</span><span class="cx"> simulation.
</span><span class="cx"> """
</span><span class="cx"> accounts = FilePath(self.mktemp())
</span><del>- accounts.setContent("foo,bar,baz,quux\nfoo2,bar2,baz2,quux2\n")
</del><ins>+ accounts.setContent("foo,bar,baz,quux,goo\nfoo2,bar2,baz2,quux2,goo2\n")
</ins><span class="cx"> config = VALID_CONFIG.copy()
</span><span class="cx"> config["accounts"] = {
</span><span class="cx"> "loader": "contrib.performance.loadtest.sim.recordsFromCSVFile",
</span></span></pre>
</div>
</div>
</body>
</html>