From f3381f49cc72fded67c1febe78b27e18ec396878 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Wed, 7 Sep 2016 09:14:27 +0800 Subject: remove imported FUNCTEST_REPO object According to openstack style guidelines in http://docs.openstack.org/developer/hacking/ **** Do not import objects, only modules (*) **** so direct FUNCTEST_REPO import should be avoided from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO JIRA: FUNCTEST-459 Change-Id: Iac0d07a54957cd7419391de183660ac1ce0efd49 Signed-off-by: SerenaFeng --- ci/prepare_env.py | 6 +++--- ci/run_tests.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'ci') diff --git a/ci/prepare_env.py b/ci/prepare_env.py index 49dcdd50..49b3ea75 100755 --- a/ci/prepare_env.py +++ b/ci/prepare_env.py @@ -20,11 +20,11 @@ import subprocess import sys import argparse +import yaml + import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils -import yaml -from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO actions = ['start', 'check'] parser = argparse.ArgumentParser() @@ -204,7 +204,7 @@ def patch_config_file(): def verify_deployment(): print_separator() logger.info("Verifying OpenStack services...") - cmd = ("%s/ci/check_os.sh" % FUNCTEST_REPO) + cmd = ("%s/ci/check_os.sh" % ft_utils.FUNCTEST_REPO) logger.debug("Executing command: %s" % cmd) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) diff --git a/ci/run_tests.py b/ci/run_tests.py index 19479383..af8f51dd 100755 --- a/ci/run_tests.py +++ b/ci/run_tests.py @@ -14,6 +14,7 @@ import re import sys import argparse + import functest.ci.generate_report as generate_report import functest.ci.tier_builder as tb import functest.utils.functest_logger as ft_logger @@ -22,7 +23,6 @@ import functest.utils.openstack_clean as os_clean import functest.utils.openstack_snapshot as os_snapshot import functest.utils.openstack_utils as os_utils from functest.testcases.Controllers.ODL.OpenDaylightTesting import ODLTestCases -from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO parser = argparse.ArgumentParser() parser.add_argument("-t", "--test", dest="test", action='store', @@ -41,7 +41,7 @@ logger = ft_logger.Logger("run_tests").getLogger() """ global variables """ -EXEC_SCRIPT = ("%s/ci/exec_test.sh" % FUNCTEST_REPO) +EXEC_SCRIPT = ("%s/ci/exec_test.sh" % ft_utils.FUNCTEST_REPO) CLEAN_FLAG = True REPORT_FLAG = False EXECUTED_TEST_CASES = [] -- cgit 1.2.3-korg