From b25c1371f82911ea26b8c893b6612bb5ae0c8c19 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Thu, 1 Mar 2018 20:03:59 +0800 Subject: leverage data_files to eliminate so many hardcoded abs_path_seekings 1. mv conf/ userconfig/ compliance/ patch to etc/ 2. after installation etc/ will be put under /etc/dovetail 3. leveraging /etc/dovetail in coding Change-Id: Icf9cb00ff7fc7cf35755f60d3e258b23e2c70839 Signed-off-by: SerenaFeng --- dovetail/run.py | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'dovetail/run.py') diff --git a/dovetail/run.py b/dovetail/run.py index cddf22ef..e43c126a 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -10,24 +10,25 @@ ############################################################################## -import click -import os import copy +import os import time import uuid -import utils.dovetail_logger as dt_logger -import utils.dovetail_utils as dt_utils +import click -from parser import Parser from container import Container +from dovetail import constants +from parser import Parser +from report import BottlenecksChecker, FunctestChecker, YardstickChecker +from report import BottlenecksCrawler, FunctestCrawler, YardstickCrawler +from report import Report +from test_runner import DockerRunner, ShellRunner from testcase import Testcase from testcase import Testsuite -from report import Report -from report import FunctestCrawler, YardstickCrawler, BottlenecksCrawler -from report import FunctestChecker, YardstickChecker, BottlenecksChecker from utils.dovetail_config import DovetailConfig as dt_cfg -from test_runner import DockerRunner, ShellRunner +import utils.dovetail_logger as dt_logger +import utils.dovetail_utils as dt_utils def load_testsuite(testsuite): @@ -212,22 +213,18 @@ def get_result_path(): def copy_userconfig_files(logger): - dovetail_home = os.path.dirname(os.path.abspath(__file__)) - userconfig_path = os.path.join(dovetail_home, 'userconfig') pre_config_path = dt_cfg.dovetail_config['config_dir'] if not os.path.isdir(pre_config_path): os.makedirs(pre_config_path) - cmd = 'sudo cp -r %s/* %s' % (userconfig_path, pre_config_path) + cmd = 'sudo cp -r %s/* %s' % (constants.USERCONF_PATH, pre_config_path) dt_utils.exec_cmd(cmd, logger, exit_on_error=False) def copy_patch_files(logger): - dovetail_home = os.path.dirname(os.path.abspath(__file__)) - patch_path = os.path.join(dovetail_home, 'patch') patch_set_path = dt_cfg.dovetail_config['patch_dir'] if not os.path.isdir(patch_set_path): os.makedirs(patch_set_path) - cmd = 'sudo cp -r %s/* %s' % (patch_path, patch_set_path) + cmd = 'sudo cp -r %s/* %s' % (constants.PATCH_PATH, patch_set_path) dt_utils.exec_cmd(cmd, logger, exit_on_error=False) @@ -313,7 +310,7 @@ def main(*args, **kwargs): .format(kwargs['testsuite'], origin_testarea)) -dt_cfg.load_config_files() +dt_cfg.load_config_files(constants.CONF_PATH) dovetail_config = copy.deepcopy(dt_cfg.dovetail_config) CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help']) if dovetail_config['cli']['options'] is not None: -- cgit 1.2.3-korg