Fix non-breaking aggregator

Revert progressbars for stepper
Cosmetics
This commit is contained in:
Andrey Pohilko 2012-09-24 13:37:52 +04:00
parent 20819daad8
commit a82f185390
4 changed files with 8 additions and 5 deletions

View File

@ -1,4 +1,6 @@
# TODO: 3 distinct private from public in classes
'''
The central part of the tool: Core
'''
from ConfigParser import NoSectionError
import ConfigParser
import logging
@ -9,6 +11,7 @@ import tempfile
import time
import traceback
# TODO: 3 name artifacts dir with date and time
class TankCore:
"""
JMeter + dstat inspired :)

View File

@ -180,6 +180,7 @@ class MonitoringCollector:
self.first_data_received = False
self.send_data = ''
self.artifact_files = []
self.inputs, self.outputs, self.excepts = [], [], []
def add_listener(self, obj):
self.listeners.append(obj)
@ -214,9 +215,7 @@ class MonitoringCollector:
logging.debug('Install monitoring agent. Host: %s' % agent.host)
self.artifact_files.append(agent.install(conf.loglevel()))
def start(self):
self.inputs, self.outputs, self.excepts = [], [], []
def start(self):
# Start N parallel agents
for a in self.agents:
pipe = a.start()

View File

@ -48,6 +48,7 @@ class AggregatorPlugin(AbstractPlugin):
while data and (limit < 1 or count < limit):
self.__notify_listeners(data)
data = self.reader.get_next_sample(force)
count += 1
def is_test_finished(self):
self.__read_samples(5)

View File

@ -640,7 +640,7 @@ class PhantomReader(AbstractReader):
return res
def __get_expected_rps(self, next_time):
# TODO: 3 optimize this
# TODO: 3 optimize expected rps with rolling property
offset = next_time - self.first_request_time
for rps, dur in Utils.pairs(self.phantom.steps):
if offset < dur: