diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-07 14:49:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-07 14:49:50 +0000 |
| commit | 227afb8285b8f178987a7d6eb1d28a74201a5d1b (patch) | |
| tree | 2501ab95b10e2958f93f6db7eba5fba66c136dd2 /testcases/OpenStack/rally | |
| parent | 800d0ed2c883a51122b7fa1aa4d9d86405ae5416 (diff) | |
| parent | f3381f49cc72fded67c1febe78b27e18ec396878 (diff) | |
Merge "remove imported FUNCTEST_REPO object"
Diffstat (limited to 'testcases/OpenStack/rally')
| -rwxr-xr-x | testcases/OpenStack/rally/run_rally-cert.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py index 7bd8b5356..536b4a5c2 100755 --- a/testcases/OpenStack/rally/run_rally-cert.py +++ b/testcases/OpenStack/rally/run_rally-cert.py @@ -20,14 +20,14 @@ import os import re import subprocess import time -import yaml import argparse +import iniparse +import yaml + 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'] @@ -75,8 +75,8 @@ logger = ft_logger.Logger("run_rally").getLogger() functest_yaml = functest_utils.get_functest_yaml() HOME = os.environ['HOME'] + "/" -RALLY_DIR = REPO_PATH + '/' + functest_yaml.get("general").get( - "directories").get("dir_rally") +RALLY_DIR = functest_utils.FUNCTEST_REPO + '/' + \ + functest_yaml.get("general").get("directories").get("dir_rally") TEMPLATE_DIR = RALLY_DIR + "scenario/templates" SUPPORT_DIR = RALLY_DIR + "scenario/support" TEMP_DIR = RALLY_DIR + "var" |