aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/OpenStack/tempest/run_tempest.py
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-09-07 14:49:50 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-07 14:49:50 +0000
commit227afb8285b8f178987a7d6eb1d28a74201a5d1b (patch)
tree2501ab95b10e2958f93f6db7eba5fba66c136dd2 /testcases/OpenStack/tempest/run_tempest.py
parent800d0ed2c883a51122b7fa1aa4d9d86405ae5416 (diff)
parentf3381f49cc72fded67c1febe78b27e18ec396878 (diff)
Merge "remove imported FUNCTEST_REPO object"
Diffstat (limited to 'testcases/OpenStack/tempest/run_tempest.py')
-rwxr-xr-xtestcases/OpenStack/tempest/run_tempest.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index e93972182..c426eb63e 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -22,11 +22,11 @@ import sys
import time
import argparse
+import yaml
+
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',
@@ -90,7 +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 + '/'
+REPO_PATH = ft_utils.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'