<!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>[15349] CalendarServer/trunk/contrib/performance/loadtest/test_sim.py</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/15349">15349</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-11-30 14:52:34 -0800 (Mon, 30 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix tests.</pre>
<h3>Modified Paths</h3>
<ul>
<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="CalendarServertrunkcontribperformanceloadtesttest_simpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_sim.py (15348 => 15349)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_sim.py 2015-11-30 21:22:41 UTC (rev 15348)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_sim.py 2015-11-30 22:52:34 UTC (rev 15349)
</span><span class="lines">@@ -38,7 +38,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> VALID_CONFIG = {
</span><del>- 'server': 'tcp:127.0.0.1:8008',
</del><ins>+ 'servers': {
+ "PodA": {
+ "enabled": True,
+ "uri": 'http://example.org:1234/',
+ "stats": {"enabled": False},
+ },
+ },
</ins><span class="cx"> 'webadmin': {
</span><span class="cx"> 'enabled': True,
</span><span class="cx"> 'HTTPPort': 8080,
</span><span class="lines">@@ -121,11 +127,19 @@
</span><span class="cx"> """
</span><span class="cx"> calsim = CalendarClientSimulator(
</span><span class="cx"> [self._user('alice'), self._user('bob'), self._user('carol')],
</span><del>- Populator(None), None, None, None, 'http://example.org:1234/', None, None)
</del><ins>+ Populator(None), None, None, None,
+ {
+ "PodA": {
+ "enabled": True,
+ "uri": 'http://example.org:1234/',
+ "stats": {"enabled": False},
+ },
+ },
+ None, None)
</ins><span class="cx"> users = sorted([
</span><del>- calsim._createUser(0)[0],
- calsim._createUser(1)[0],
- calsim._createUser(2)[0],
</del><ins>+ calsim._createUser(0)[1],
+ calsim._createUser(1)[1],
+ calsim._createUser(2)[1],
</ins><span class="cx"> ])
</span><span class="cx"> self.assertEqual(['alice', 'bob', 'carol'], users)
</span><span class="cx">
</span><span class="lines">@@ -137,8 +151,16 @@
</span><span class="cx"> """
</span><span class="cx"> calsim = CalendarClientSimulator(
</span><span class="cx"> [self._user('alice')],
</span><del>- Populator(None), None, None, None, 'http://example.org:1234/', None, None)
- user, auth = calsim._createUser(0)
</del><ins>+ Populator(None), None, None, None,
+ {
+ "PodA": {
+ "enabled": True,
+ "uri": 'http://example.org:1234/',
+ "stats": {"enabled": False},
+ },
+ },
+ None, None)
+ _ignore_record, user, auth = calsim._createUser(0)
</ins><span class="cx"> self.assertEqual(
</span><span class="cx"> auth['basic'].passwd.find_user_password('Test Realm', 'http://example.org:1234/')[1],
</span><span class="cx"> 'password-' + user)
</span><span class="lines">@@ -182,7 +204,15 @@
</span><span class="cx"> [ProfileType(BrokenProfile, {'runResult': profileRunResult})])
</span><span class="cx"> )
</span><span class="cx"> sim = CalendarClientSimulator(
</span><del>- [self._user('alice')], Populator(None), None, params, None, 'http://example.com:1234/', None, None)
</del><ins>+ [self._user('alice')], Populator(None), None, params, None,
+ {
+ "PodA": {
+ "enabled": True,
+ "uri": 'http://example.org:1234/',
+ "stats": {"enabled": False},
+ },
+ },
+ None, None)
</ins><span class="cx"> sim.add(1, 1)
</span><span class="cx"> sim.stop()
</span><span class="cx"> clientRunResult.errback(RuntimeError("Some fictional client problem"))
</span><span class="lines">@@ -270,14 +300,20 @@
</span><span class="cx"> with its own reactor and host and port information from the
</span><span class="cx"> configuration file.
</span><span class="cx"> """
</span><del>- server = 'http://127.0.0.7:1243/'
</del><ins>+ servers = {
+ "PodA": {
+ "enabled": True,
+ "uri": 'http://example.org:1234/',
+ "stats": {"enabled": False},
+ },
+ }
</ins><span class="cx"> reactor = object()
</span><del>- sim = LoadSimulator(server, None, None, None, None, None, None, reactor=reactor)
</del><ins>+ sim = LoadSimulator(servers, None, None, None, None, None, None, reactor=reactor)
</ins><span class="cx"> calsim = sim.createSimulator()
</span><span class="cx"> self.assertIsInstance(calsim, CalendarClientSimulator)
</span><span class="cx"> self.assertIsInstance(calsim.reactor, LagTrackingReactor)
</span><span class="cx"> self.assertIdentical(calsim.reactor._reactor, reactor)
</span><del>- self.assertEquals(calsim.server, server)
</del><ins>+ self.assertEquals(calsim.servers, servers)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_loadAccountsFromFile(self):
</span><span class="lines">@@ -292,7 +328,8 @@
</span><span class="cx"> config["accounts"] = {
</span><span class="cx"> "loader": "contrib.performance.loadtest.sim.recordsFromCSVFile",
</span><span class="cx"> "params": {
</span><del>- "path": accounts.path
</del><ins>+ "path": accounts.path,
+ "interleavePods": True,
</ins><span class="cx"> },
</span><span class="cx"> }
</span><span class="cx"> configpath = FilePath(self.mktemp())
</span><span class="lines">@@ -321,7 +358,8 @@
</span><span class="cx"> config["accounts"] = {
</span><span class="cx"> "loader": "contrib.performance.loadtest.sim.recordsFromCSVFile",
</span><span class="cx"> "params": {
</span><del>- "path": ""
</del><ins>+ "path": "",
+ "interleavePods": True,
</ins><span class="cx"> },
</span><span class="cx"> }
</span><span class="cx"> configpath = FilePath(self.mktemp())
</span><span class="lines">@@ -417,10 +455,16 @@
</span><span class="cx"> """
</span><span class="cx"> config = FilePath(self.mktemp())
</span><span class="cx"> config.setContent(
</span><del>- writePlistToString({"server": "https://127.0.0.3:8432/"})
</del><ins>+ writePlistToString({"servers": {
+ "PodA": {
+ "enabled": True,
+ "uri": 'https://127.0.0.3:8432/',
+ "stats": {"enabled": False},
+ },
+ }})
</ins><span class="cx"> )
</span><span class="cx"> sim = LoadSimulator.fromCommandLine(['--config', config.path])
</span><del>- self.assertEquals(sim.server, "https://127.0.0.3:8432/")
</del><ins>+ self.assertEquals(sim.servers["PodA"]["uri"], "https://127.0.0.3:8432/")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_loadArrivalConfig(self):
</span><span class="lines">@@ -460,7 +504,7 @@
</span><span class="cx">
</span><span class="cx"> reactor = object()
</span><span class="cx"> sim = LoadSimulator(
</span><del>- None, None, None, None, None, Arrival(FakeArrival, {'x': 3, 'y': 2}), None, reactor=reactor)
</del><ins>+ None, None, None, None, Arrival(FakeArrival, {'x': 3, 'y': 2}), None, reactor=reactor)
</ins><span class="cx"> arrival = sim.createArrivalPolicy()
</span><span class="cx"> self.assertIsInstance(arrival, FakeArrival)
</span><span class="cx"> self.assertIdentical(arrival.reactor, sim.reactor)
</span><span class="lines">@@ -575,11 +619,16 @@
</span><span class="cx"> """
</span><span class="cx"> observers = [Observer()]
</span><span class="cx"> sim = LoadSimulator(
</span><del>- "http://example.com:123/",
</del><ins>+ {
+ "PodA": {
+ "enabled": True,
+ "uri": 'http://example.org:1234/',
+ "stats": {"enabled": False},
+ },
+ },
</ins><span class="cx"> "/principals/users/%s/",
</span><span class="cx"> None,
</span><span class="cx"> None,
</span><del>- None,
</del><span class="cx"> Arrival(lambda reactor: NullArrival(), {}),
</span><span class="cx"> None, observers, reactor=Reactor())
</span><span class="cx"> io = StringIO()
</span></span></pre>
</div>
</div>
</body>
</html>