setup, not startup

This commit is contained in:
Alexey Lavrenuke 2016-06-01 20:02:44 +03:00
parent 26c7cbd24d
commit 26e4d3a5c8
3 changed files with 9 additions and 9 deletions

View File

@ -14,8 +14,8 @@ class LoadTest(object):
with self.gun.measure("case2"):
log.info("Shoot case 2: %s", missile)
def startup(self):
log.info("Starting up LoadTest")
def setup(self):
log.info("Setting up LoadTest")
def teardown(self):
log.info("Tearing down LoadTest")

View File

@ -52,7 +52,7 @@ class AbstractGun(AbstractPlugin):
self.results.put(data_item, timeout=1)
def startup(self):
def setup(self):
pass
def shoot(self, missile, marker):
@ -139,7 +139,7 @@ class CustomGun(AbstractGun):
except Exception as e:
logger.warning("CustomGun %s failed with %s", marker, e)
def startup(self):
def setup(self):
if hasattr(self.module, 'init'):
self.module.init(self)
@ -191,7 +191,7 @@ class ScenarioGun(AbstractGun):
else:
logger.warning("Scenario not found: %s", marker)
def startup(self):
def setup(self):
if hasattr(self.module, 'init'):
self.module.init(self)
@ -224,9 +224,9 @@ class UltimateGun(AbstractGun):
(class_name, module_name))
self.load_test = test_class(self)
def startup(self):
if callable(getattr(self.load_test, "startup", None)):
self.load_test.startup()
def setup(self):
if callable(getattr(self.load_test, "setup", None)):
self.load_test.setup()
def teardown(self):
if callable(getattr(self.load_test, "teardown", None)):

View File

@ -145,7 +145,7 @@ Gun: {gun.__class__.__name__}
"""
logger.debug("Init shooter process")
try:
self.gun.startup()
self.gun.setup()
except Exception:
logger.exception("Couldn't initialize gun. Exit shooter process")
return