[CalendarServer-changes] [9027] CalendarServer/trunk/contrib/performance/loadtest/test_sim.py

[source_changes at macosforge.org]

Revision: 9027
          http://trac.macosforge.org/projects/calendarserver/changeset/9027
Author:   dre at apple.com
Date:     2012-04-11 04:31:16 -0700 (Wed, 11 Apr 2012)
Log Message:
-----------
Fix load sim tests for webadmin changes

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

Modified: CalendarServer/trunk/contrib/performance/loadtest/test_sim.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/test_sim.py	2012-04-11 03:10:50 UTC (rev 9026)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_sim.py	2012-04-11 11:31:16 UTC (rev 9027)
@@ -37,6 +37,10 @@
 
 VALID_CONFIG = {
     'server': 'tcp:127.0.0.1:8008',
+    'webadmin': {
+        'enabled': True,
+        'HTTPPort': 8080,
+        },
     'arrival': {
         'factory': 'contrib.performance.loadtest.population.SmoothRampUp',
         'params': {
@@ -209,7 +213,7 @@
         self.events.append(event)
 
 
-    def report(self):
+    def report(self, output):
         self.reported = True
 
 
@@ -241,7 +245,7 @@
         exc = self.assertRaises(
             SystemExit, StubSimulator.main, ['--config', config.path])
         self.assertEquals(
-            exc.args, (StubSimulator(None, None, None).run(),))
+            exc.args, (StubSimulator(None, None, None, None).run(),))
 
 
     def test_createSimulator(self):
@@ -252,7 +256,7 @@
         """
         server = 'http://127.0.0.7:1243/'
         reactor = object()
-        sim = LoadSimulator(server, None, None, reactor=reactor)
+        sim = LoadSimulator(server, None, None, None, reactor=reactor)
         calsim = sim.createSimulator()
         self.assertIsInstance(calsim, CalendarClientSimulator)
         self.assertIsInstance(calsim.reactor, LagTrackingReactor)
@@ -432,7 +436,7 @@
 
         reactor = object()
         sim = LoadSimulator(
-            None, Arrival(FakeArrival, {'x': 3, 'y': 2}), None, reactor=reactor)
+            None, None, Arrival(FakeArrival, {'x': 3, 'y': 2}), None, reactor=reactor)
         arrival = sim.createArrivalPolicy()
         self.assertIsInstance(arrival, FakeArrival)
         self.assertIdentical(arrival.reactor, sim.reactor)
@@ -509,6 +513,7 @@
         observers = [Observer()]
         sim = LoadSimulator(
             "http://example.com:123/",
+            None,
             Arrival(lambda reactor: NullArrival(), {}),
             None, observers, reactor=Reactor())
         io = StringIO()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120411/0a07c87b/attachment.html>