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

[source_changes at macosforge.org]

Revision: 7072
          http://trac.macosforge.org/projects/calendarserver/changeset/7072
Author:   exarkun at twistedmatrix.com
Date:     2011-02-23 14:05:16 -0800 (Wed, 23 Feb 2011)
Log Message:
-----------
Finish implementing log observer setup

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-23 19:19:34 UTC (rev 7071)
+++ CalendarServer/trunk/contrib/performance/loadtest/sim.py	2011-02-23 22:05:16 UTC (rev 7072)
@@ -172,6 +172,8 @@
 
 
     def run(self):
+        for obs in self.observers:
+            addObserver(obs.observe)
         sim = self.createSimulator()
         arrivalPolicy = self.createArrivalPolicy()
         arrivalPolicy.run(sim)

Modified: CalendarServer/trunk/contrib/performance/loadtest/test_sim.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/test_sim.py	2011-02-23 19:19:34 UTC (rev 7071)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_sim.py	2011-02-23 22:05:16 UTC (rev 7072)
@@ -18,7 +18,7 @@
 from operator import setitem
 from plistlib import writePlistToString
 
-from twisted.python.log import LogPublisher, theLogPublisher
+from twisted.python.log import LogPublisher, theLogPublisher, msg
 from twisted.python.usage import UsageError
 from twisted.python.filepath import FilePath
 from twisted.trial.unittest import TestCase
@@ -94,10 +94,13 @@
 
 
 class Reactor(object):
+    message = "some event to be observed"
+
     def run(self):
-        pass
+        msg(self.message)
 
 
+
 class Observer(object):
     def __init__(self):
         self.reported = False
@@ -259,19 +262,12 @@
         self.assertEquals(len(sim.observers), 1)
         self.assertIsInstance(sim.observers[0], SimpleStatistics)
 
-    def test_observeBeforeRun(self):
+    def test_observeRunReport(self):
         """
         Each log observer is added to the log publisher before the
-        simulation run is started.
+        simulation run is started and has its C{report} method called
+        after the simulation run completes.
         """
-        self.fail("implement me")
-
-
-    def test_reportAfterRun(self):
-        """
-        Each log observer also has its C{report} method called after
-        the simulation run completes.
-        """
         observers = [Observer()]
         sim = LoadSimulator(
             Server('example.com', 123), 
@@ -279,4 +275,5 @@
             None, observers, Reactor())
         sim.run()
         self.assertTrue(observers[0].reported)
-
+        self.assertEquals(
+            observers[0].events[0]['message'], (Reactor.message,))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110223/87f2fec3/attachment.html>