aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2016-09-01 10:19:58 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2016-09-01 16:44:18 +0800
commit470f573a3ac2eb1783efec6da01a3bee33360c65 (patch)
tree859f4bbd7afc35ce2a8ca33b0bc570f7f32c5724 /utils
parentc94a1c01e46b21f0139a8b1419f26c8b9f867a41 (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 'utils')
-rw-r--r--utils/functest_utils.py2
-rwxr-xr-xutils/openstack_snapshot.py6
2 files changed, 1 insertions, 7 deletions
diff --git a/utils/functest_utils.py b/utils/functest_utils.py
index 0fc6adf00..8c5dd835a 100644
--- a/utils/functest_utils.py
+++ b/utils/functest_utils.py
@@ -28,7 +28,7 @@ import yaml
logger = ft_logger.Logger("functest_utils").getLogger()
REPOS_DIR = os.getenv('repos_dir')
-FUNCTEST_REPO = ("%s/functest/" % REPOS_DIR)
+FUNCTEST_REPO = ("%s/functest" % REPOS_DIR)
# ----------------------------------------------------------
diff --git a/utils/openstack_snapshot.py b/utils/openstack_snapshot.py
index 058f9ded3..236cf74e5 100755
--- a/utils/openstack_snapshot.py
+++ b/utils/openstack_snapshot.py
@@ -20,7 +20,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
#
-import os
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
import functest.utils.openstack_utils as os_utils
@@ -29,11 +28,6 @@ import yaml
logger = ft_logger.Logger("openstack_snapshot").getLogger()
-REPO_PATH = os.environ['repos_dir'] + '/functest/'
-if not os.path.exists(REPO_PATH):
- logger.error("Functest repository directory not found '%s'" % REPO_PATH)
- exit(-1)
-
OS_SNAPSHOT_FILE = ft_utils.get_parameter_from_yaml(
"general.openstack.snapshot_file")