diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-01 10:19:58 +0800 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-02 08:10:45 +0000 |
| commit | b582e4a5be0bcc3521cc239a31f681a11f4504db (patch) | |
| tree | b36928805f35e2d2d55c3e3057db6ebf10a89001 /utils | |
| parent | f62e61cb31e3a39026c4f0bbdb6d6b4a1aebc2f3 (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>
(cherry picked from commit 470f573a3ac2eb1783efec6da01a3bee33360c65)
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/functest_utils.py | 2 | ||||
| -rwxr-xr-x | utils/openstack_snapshot.py | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/utils/functest_utils.py b/utils/functest_utils.py index ff8234104..041601e21 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") |