diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-01 10:19:58 +0800 |
|---|---|---|
| committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-01 16:44:18 +0800 |
| commit | 470f573a3ac2eb1783efec6da01a3bee33360c65 (patch) | |
| tree | 859f4bbd7afc35ce2a8ca33b0bc570f7f32c5724 /cli/commands/cli_os.py | |
| parent | c94a1c01e46b21f0139a8b1419f26c8b9f867a41 (diff) | |
stop hardcoded FUNCTEST_REPO path everywhere
functest repo is used by almost every testcase, each place we get it like:
REPOS_DIR = os.getenv('repos_dir')
FUNCTEST_REPO = ("%s/functest" % REPOS_DIR)
provide a common interface in functest_util.py
JIRA: FUNCTEST-453
Change-Id: Ie0635dacc761ed2d05b7e606530368844f32ebaf
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'cli/commands/cli_os.py')
| -rw-r--r-- | cli/commands/cli_os.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cli/commands/cli_os.py b/cli/commands/cli_os.py index a3b7ad31e..d38dc9e6a 100644 --- a/cli/commands/cli_os.py +++ b/cli/commands/cli_os.py @@ -14,11 +14,10 @@ import click import functest.utils.functest_utils as ft_utils import functest.utils.openstack_clean as os_clean import functest.utils.openstack_snapshot as os_snapshot +from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO functest_yaml = ft_utils.get_functest_yaml() -REPOS_DIR = os.getenv('repos_dir') -FUNCTEST_REPO = ("%s/functest/" % REPOS_DIR) FUNCTEST_CONF_DIR = functest_yaml.get("general").get( "directories").get("dir_functest_conf") RC_FILE = os.getenv('creds') @@ -81,7 +80,7 @@ class CliOpenStack: def check(self): self.ping_endpoint() - cmd = FUNCTEST_REPO + "ci/check_os.sh" + cmd = FUNCTEST_REPO + "/ci/check_os.sh" ft_utils.execute_command(cmd, verbose=False) def snapshot_create(self): |