From a83c0cfc5b1410ada3d8c54b32d3904adf3ab8f8 Mon Sep 17 00:00:00 2001 From: xudan Date: Sat, 26 Nov 2016 08:19:21 +0000 Subject: dovetail tool: run.py execution always wipes of results files 1. move function clean_results_dir() into run.py 2. call this function at the beginning of function main() 3. this can only work correctly after all log initializations packaged, see JIRA: DOVETAIL-56 and gerrit https://gerrit.opnfv.org/gerrit/#/c/24059/ JIRA: DOVETAIL-80 Change-Id: I1cdda8f6d43f21c45c0537868cb7ed10d14ea9df Signed-off-by: xudan --- dovetail/run.py | 20 ++++++++++++++++---- dovetail/utils/dovetail_logger.py | 10 ---------- 2 files changed, 16 insertions(+), 14 deletions(-) (limited to 'dovetail') diff --git a/dovetail/run.py b/dovetail/run.py index cc0e7940..891155b5 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -10,18 +10,18 @@ import click import sys +import os import utils.dovetail_logger as dt_logger +import utils.dovetail_utils as dt_utils from parser import Parser from container import Container from testcase import Testcase from testcase import Testsuite from report import Report -from report import FunctestCrawler -from report import YardstickCrawler -from report import FunctestChecker -from report import YardstickChecker +from report import FunctestCrawler, YardstickCrawler +from report import FunctestChecker, YardstickChecker from conf.dovetail_config import DovetailConfig as dt_config @@ -120,8 +120,20 @@ def create_logs(): Testsuite.create_log() +def clean_results_dir(): + result_path = dt_config.dovetail_config['result_dir'] + if os.path.exists(result_path): + if os.path.isdir(result_path): + cmd = 'sudo rm -rf %s/*' % (result_path) + dt_utils.exec_cmd(cmd, exit_on_error=False) + else: + print "result_dir in dovetail_config.yml is not a directory." + sys.exit(-1) + + def main(*args, **kwargs): """Dovetail compliance test entry!""" + clean_results_dir() create_logs() logger = dt_logger.Logger('run').getLogger() logger.info('================================================') diff --git a/dovetail/utils/dovetail_logger.py b/dovetail/utils/dovetail_logger.py index e725e612..8afa08a1 100644 --- a/dovetail/utils/dovetail_logger.py +++ b/dovetail/utils/dovetail_logger.py @@ -25,16 +25,6 @@ import logging import os from conf.dovetail_config import DovetailConfig as dt_config -import dovetail_utils as dt_utils - - -def clean_results_dir(): - result_path = dt_config.dovetail_config['result_dir'] - if os.path.exists(result_path): - cmd = 'sudo rm -rf %s/*' % (result_path) - dt_utils.exec_cmd(cmd, exit_on_error=False) - -clean_results_dir() class Logger: -- cgit 1.2.3-korg