diff options
author | 2016-09-01 10:19:58 +0800 | |
---|---|---|
committer | 2016-09-01 16:44:18 +0800 | |
commit | 470f573a3ac2eb1783efec6da01a3bee33360c65 (patch) | |
tree | 859f4bbd7afc35ce2a8ca33b0bc570f7f32c5724 /testcases/OpenStack/rally | |
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 'testcases/OpenStack/rally')
-rwxr-xr-x | testcases/OpenStack/rally/run_rally-cert.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py index e04ecbc5..85d21d9b 100755 --- a/testcases/OpenStack/rally/run_rally-cert.py +++ b/testcases/OpenStack/rally/run_rally-cert.py @@ -26,6 +26,7 @@ import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as functest_utils import functest.utils.openstack_utils as os_utils import iniparse +from functest.utils.functest_utils import FUNCTEST_REPO as REPO_PATH tests = ['authenticate', 'glance', 'cinder', 'heat', 'keystone', 'neutron', 'nova', 'quotas', 'requests', 'vm', 'all'] @@ -69,16 +70,11 @@ else: """ logging configuration """ logger = ft_logger.Logger("run_rally").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) - functest_yaml = functest_utils.get_functest_yaml() HOME = os.environ['HOME'] + "/" -RALLY_DIR = REPO_PATH + functest_yaml.get("general").get( +RALLY_DIR = REPO_PATH + '/' + functest_yaml.get("general").get( "directories").get("dir_rally") TEMPLATE_DIR = RALLY_DIR + "scenario/templates" SUPPORT_DIR = RALLY_DIR + "scenario/support" |