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

[source_changes at macosforge.org]

Revision: 7046
          http://trac.macosforge.org/projects/calendarserver/changeset/7046
Author:   exarkun at twistedmatrix.com
Date:     2011-02-18 07:47:02 -0800 (Fri, 18 Feb 2011)
Log Message:
-----------
Respect configuration for arrival policy in LoadSimulator

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

Modified: CalendarServer/trunk/contrib/performance/loadtest/sim.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/sim.py	2011-02-18 15:31:36 UTC (rev 7045)
+++ CalendarServer/trunk/contrib/performance/loadtest/sim.py	2011-02-18 15:47:02 UTC (rev 7046)
@@ -124,8 +124,7 @@
 
 
     def createArrivalPolicy(self):
-        return SmoothRampUp(
-            self.reactor, groups=10, groupSize=1, interval=3)
+        return self.arrival.factory(self.reactor, **self.arrival.parameters)
 
 
     def run(self):

Modified: CalendarServer/trunk/contrib/performance/loadtest/test_sim.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/test_sim.py	2011-02-18 15:31:36 UTC (rev 7045)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_sim.py	2011-02-18 15:47:02 UTC (rev 7046)
@@ -163,10 +163,19 @@
     def test_createArrivalPolicy(self):
         """
         L{LoadSimulator.createArrivalPolicy} creates an arrival
-        policy.
+        policy based on the L{Arrival} passed to its initializer.
         """
+        class FakeArrival(object):
+            def __init__(self, reactor, x, y):
+                self.reactor = reactor
+                self.x = x
+                self.y = y
+
         reactor = object()
-        sim = LoadSimulator(None, None, reactor)
+        sim = LoadSimulator(
+            None, Arrival(FakeArrival, {'x': 3, 'y': 2}), reactor)
         arrival = sim.createArrivalPolicy()
-        self.assertIsInstance(arrival, SmoothRampUp)
+        self.assertIsInstance(arrival, FakeArrival)
         self.assertIdentical(arrival.reactor, reactor)
+        self.assertEquals(arrival.x, 3)
+        self.assertEquals(arrival.y, 2)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110218/8cae9f3a/attachment.html>