plugin options; StpdReader fix

This commit is contained in:
Arseniy Fomchenko 2016-10-25 20:41:09 +03:00
parent c55c375b0e
commit b26479ea40
2 changed files with 3 additions and 3 deletions

View File

@ -18,7 +18,7 @@ class Plugin(AbstractPlugin, AggregateResultListener, MonitoringDataListener):
SECTION = 'json_report'
def get_available_options(self):
return []
return ['monitoring_log', 'test_data_log', 'test_stats_log']
def configure(self):
self.monitoring_logger = self.create_file_logger('monitoring',

View File

@ -29,9 +29,9 @@ class StpdReader(object):
def __iter__(self):
def read_chunk_header(ammo_file):
chunk_header = ''
while chunk_header in '':
while not chunk_header:
line = ammo_file.readline().decode('utf8')
if line in '':
if not line:
return line # EOF
chunk_header = line.strip('\r\n')
return chunk_header