aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/OpenStack/tempest
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 /testcases/OpenStack/tempest
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 'testcases/OpenStack/tempest')
-rwxr-xr-xtestcases/OpenStack/tempest/run_tempest.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index 3fa9b368e..e93972182 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -14,7 +14,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
#
import ConfigParser
-import argparse
import os
import re
import shutil
@@ -22,11 +21,12 @@ import subprocess
import sys
import time
+import argparse
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
modes = ['full', 'smoke', 'baremetal', 'compute', 'data_processing',
'identity', 'image', 'network', 'object_storage', 'orchestration',
@@ -58,8 +58,6 @@ args = parser.parse_args()
""" logging configuration """
logger = ft_logger.Logger("run_tempest").getLogger()
-REPO_PATH = os.environ['repos_dir'] + '/functest/'
-
functest_yaml = ft_utils.get_functest_yaml()
TEST_DB = functest_yaml.get("results").get("test_db_url")
@@ -92,6 +90,7 @@ RESULTS_DIR = functest_yaml.get("general").get("directories").get(
TEMPEST_RESULTS_DIR = RESULTS_DIR + '/tempest'
TEST_LIST_DIR = functest_yaml.get("general").get("directories").get(
"dir_tempest_cases")
+REPO_PATH = FUNCTEST_REPO + '/'
TEMPEST_CUSTOM = REPO_PATH + TEST_LIST_DIR + 'test_list.txt'
TEMPEST_BLACKLIST = REPO_PATH + TEST_LIST_DIR + 'blacklist.txt'
TEMPEST_DEFCORE = REPO_PATH + TEST_LIST_DIR + 'defcore_req.txt'