diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-07 09:14:27 +0800 |
|---|---|---|
| committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-07 20:47:51 +0800 |
| commit | f3381f49cc72fded67c1febe78b27e18ec396878 (patch) | |
| tree | e6c7558efe3b08575c4589b2a46ef62e5d22d63f /ci/prepare_env.py | |
| parent | 44364e6db1941410632e6ab732e72bcc718a86da (diff) | |
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 <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'ci/prepare_env.py')
| -rwxr-xr-x | ci/prepare_env.py | 6 |
1 files changed, 3 insertions, 3 deletions
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) |