valitydev/yandex-tank
14
0
Fork 0
mirror of https://github.com/valitydev/yandex-tank.git synced 2024-11-06 10:25:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move ammo_count and loop_count entirely into STATUS

Browse Source
This commit is contained in:
Alexey Lavrenuke (load testing) 2013-07-16 16:30:14 +04:00
parent d51781de66
commit eba81f5e80
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Tank/stepper/info.py
View File

@ -51,6 +51,7 @@ StepperInfo = namedtuple(
class StepperStatus(object):
'''
Raises StopIteration when limits are reached.
'''
@ -58,11 +59,11 @@ class StepperStatus(object):
def __init__(self):
self.log = logging.getLogger(__name__)
self.info = {
'loop_count': None,
'loop_count': 0,
'steps': None,
'loadscheme': None,
'duration': None,
'ammo_count': None,
'ammo_count': 0,
}
self.loop_limit = None
self.ammo_limit = None
@ -76,28 +77,34 @@ class StepperStatus(object):
@property
def ammo_count(self):
#return self._ammo_count
# return self._ammo_count
return self.info['ammo_count']
@ammo_count.setter
def ammo_count(self, value):
#self._ammo_count = value
# self._ammo_count = value
self.info['ammo_count'] = value
if self.ammo_limit and value > self.ammo_limit:
raise StopIteration
def inc_ammo_count(self):
self.ammo_count += 1
@property
def loop_count(self):
#return self._loop_count
# return self._loop_count
return self.info['loop_count']
@loop_count.setter
def loop_count(self, value):
#self._loop_count = value
# self._loop_count = value
self.info['loop_count'] = value
if self.loop_limit and value > self.loop_limit:
raise StopIteration
def inc_loop_count(self):
self.loop_count += 1
def get_info(self):
for key in self.info:
if self.info[key] is None:

26
Tank/stepper/missile.py
View File

@ -44,9 +44,8 @@ class SimpleGenerator(object):
def __iter__(self):
for m in self.missiles:
self.loops += 1
STATUS.loop_count = self.loops
STATUS.ammo_count = self.loops # loops equals ammo count
STATUS.inc_loop_count()
STATUS.inc_ammo_count() # loops equals ammo count
yield m
def loop_count(self):
@ -63,25 +62,16 @@ class UriStyleGenerator(SimpleGenerator):
'''
uris - a list of URIs as strings.
'''
self.ammo_count = 0
self.loop_count = 0
self.uri_count = len(uris)
self.missiles = cycle(
[(HttpAmmo(uri, headers, http_ver=http_ver).to_s(), None) for uri in uris])
def __iter__(self):
for m in self.missiles:
self.ammo_count += 1
STATUS.ammo_count = self.ammo_count
self.update_loop_count()
STATUS.inc_ammo_count()
STATUS.loop_count = STATUS.ammo_count / self.uri_count
yield m
def update_loop_count(self):
loop_count = self.ammo_count / self.uri_count
if self.loop_count != loop_count:
STATUS.loop_count = loop_count
self.loop_count = loop_count
class AmmoFileReader(SimpleGenerator):
@ -89,11 +79,9 @@ class AmmoFileReader(SimpleGenerator):
def __init__(self, filename, loop_limit=0):
self.filename = filename
self.loops = 0
def __iter__(self):
with open(self.filename, 'rb') as ammo_file:
ammo_count = 0
chunk_header = ammo_file.readline()
while chunk_header:
if chunk_header.strip('\r\n') is not '':
@ -105,15 +93,13 @@ class AmmoFileReader(SimpleGenerator):
if len(missile) < chunk_size:
raise AmmoFileError(
"Unexpected end of file: read %s bytes instead of %s" % (len(missile), chunk_size))
ammo_count += 1
STATUS.ammo_count = ammo_count
STATUS.inc_ammo_count()
yield (missile, marker)
except (IndexError, ValueError):
raise AmmoFileError(
"Error while reading ammo file. Position: %s, header: '%s'" % (ammo_file.tell(), chunk_header))
chunk_header = ammo_file.readline()
if not chunk_header:
self.loops += 1
STATUS.loop_count = self.loops
STATUS.inc_loop_count()
ammo_file.seek(0)
chunk_header = ammo_file.readline()