Pass cycle and cvus to midCycle hook

bdelbosc · bdelbosc · commit beb804c68b76 · 2014-01-06T15:23:08.000+01:00
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -22,6 +22,8 @@ FunkLoad GIT master
 New Features
 ~~~~~~~~~~~~~~
 
+* Support https proxy (http proxy was already supported)
+
 * Add a midCycle hook to execute an action in the middle of a cycle
 
 * Add -L options to fl-record to enable tcpwatch forwarded mode
diff --git a/src/funkload/BenchRunner.py b/src/funkload/BenchRunner.py
@@ -332,7 +332,7 @@ def run(self):
             trace(' done.\n')
             self.startMonitors(monitor_key)
             self.startThreads(cycle, cvus)
-            self.logging()
+            self.logging(cycle, cvus)
             #self.dumpThreads()
             self.stopThreads()
             self.stopMonitors(monitor_key)
@@ -426,7 +426,7 @@ def createThreads(self, cycle, number_of_threads):
         trace(' done.\n')
         return threads
 
-    def logging(self):
+    def logging(self, cycle, cvus):
         """Log activity during duration."""
         duration = self.duration
         end_time = time.time() + duration
@@ -436,7 +436,7 @@ def logging(self):
         set_recording_flag(True)
         while time.time() < mid_time:
             time.sleep(1)
-        self.test.midCycle()
+        self.test.midCycle(cycle, cvus)
         while time.time() < end_time:
             # wait
             time.sleep(1)
diff --git a/src/funkload/FunkLoadTestCase.py b/src/funkload/FunkLoadTestCase.py
@@ -729,8 +729,8 @@ def setUpCycle(self):
         """Called on bench mode before a cycle start."""
         pass
 
-    def midCycle(self):
-        """Called in the middle of the cycle."""
+    def midCycle(self, cycle, cvus):
+        """Called in the middle of a bench cycle."""
         pass
 
     def tearDownCycle(self):
