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

Remove console specific code from Core to ConsoleWorker

Browse Source
This commit is contained in:
Andrey Pohilko 2012-10-01 15:28:53 +04:00
parent 35da090cff
commit 0cbcf3fb3b
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Tank/ConsoleWorker.py
View File

@ -80,6 +80,7 @@ class ConsoleTank:
self.log = logging.getLogger(__name__) self.log = logging.getLogger(__name__)
self.signal_count = 0 self.signal_count = 0
self.scheduled_start = None
def set_baseconfigs_dir(self, directory): def set_baseconfigs_dir(self, directory):
''' '''
@ -266,14 +267,11 @@ class ConsoleTank:
self.core.load_plugins() self.core.load_plugins()
if self.options.manual_start:
self.core.manual_start = self.options.manual_start
if self.options.scheduled_start: if self.options.scheduled_start:
try: try:
self.core.scheduled_start = datetime.datetime.strptime(self.options.scheduled_start, '%Y-%m-%d %H:%M:%S') self.scheduled_start = datetime.datetime.strptime(self.options.scheduled_start, '%Y-%m-%d %H:%M:%S')
except ValueError: except ValueError:
self.core.scheduled_start = datetime.datetime.strptime(datetime.datetime.now().strftime('%Y-%m-%d ') + self.options.scheduled_start, '%Y-%m-%d %H:%M:%S') self.scheduled_start = datetime.datetime.strptime(datetime.datetime.now().strftime('%Y-%m-%d ') + self.options.scheduled_start, '%Y-%m-%d %H:%M:%S')
def __graceful_shutdown(self): def __graceful_shutdown(self):
@ -294,6 +292,16 @@ class ConsoleTank:
try: try:
self.core.plugins_configure() self.core.plugins_configure()
self.core.plugins_prepare_test() self.core.plugins_prepare_test()
if self.scheduled_start:
self.log.info("Waiting scheduled time: %s...", self.scheduled_start)
while datetime.datetime.now() < self.scheduled_start:
self.log.debug("Not yet: %s < %s", datetime.datetime.now(), self.scheduled_start)
time.sleep(1)
self.log.info("Time has come: %s", datetime.datetime.now())
if self.options.manual_start:
raw_input("Press Enter key to start test:")
self.core.plugins_start_test() self.core.plugins_start_test()
retcode = self.core.wait_for_finish() retcode = self.core.wait_for_finish()
retcode = self.core.plugins_end_test(retcode) retcode = self.core.plugins_end_test(retcode)

10
Tank/Core.py
View File

@ -110,16 +110,6 @@ class TankCore:
''' '''
Call start_test() on all plugins Call start_test() on all plugins
''' '''
if self.scheduled_start:
self.log.info("Waiting scheduled time: %s...", self.scheduled_start)
while datetime.datetime.now() < self.scheduled_start:
self.log.debug("Not yet: %s < %s", datetime.datetime.now(), self.scheduled_start)
time.sleep(1)
self.log.info("Time has come: %s", datetime.datetime.now())
if self.manual_start:
raw_input("Press Enter key to start test:")
self.log.info("Starting test...") self.log.info("Starting test...")
for plugin_key in self.plugins_order: for plugin_key in self.plugins_order:
plugin = self.__get_plugin_by_key(plugin_key) plugin = self.__get_plugin_by_key(plugin_key)