diff options
author | SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-08-31 10:22:33 +0800 |
---|---|---|
committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-08-31 23:20:19 +0800 |
commit | f4d0a05011e961a363c6d99522684ecdeb959716 (patch) | |
tree | 4fe3d75e31cb3f9e56bffe37cb98e79ea9851c87 /testcases/features | |
parent | fe5d0f8628b8e0defdfc6e3b0e4556b46311a2f9 (diff) |
unify functest_yaml obtain process
functest_yaml is needed in almost all of the testcases, the obtain process is the same:
with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
functest_yaml = yaml.safe_load(f)
f.close()
abstract a method to unify the process, and provide the interface
JIRA: FUNCTEST-447
Change-Id: I96a9a9962d7b466f10bbd3b5ab2495957524e22a
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'testcases/features')
-rwxr-xr-x | testcases/features/copper.py | 8 | ||||
-rwxr-xr-x | testcases/features/doctor.py | 7 | ||||
-rwxr-xr-x | testcases/features/domino.py | 7 | ||||
-rwxr-xr-x | testcases/features/promise.py | 9 |
4 files changed, 10 insertions, 21 deletions
diff --git a/testcases/features/copper.py b/testcases/features/copper.py index c79754a1b..73def7db2 100755 --- a/testcases/features/copper.py +++ b/testcases/features/copper.py @@ -14,13 +14,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import argparse -import os import sys import time + +import argparse import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as functest_utils -import yaml parser = argparse.ArgumentParser() parser.add_argument("-r", "--report", @@ -28,8 +27,7 @@ parser.add_argument("-r", "--report", action="store_true") args = parser.parse_args() -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) +functest_yaml = functest_utils.get_functest_yaml() dirs = functest_yaml.get('general').get('directories') COPPER_REPO = dirs.get('dir_repo_copper') diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py index 02edd25ca..6e6f26f37 100755 --- a/testcases/features/doctor.py +++ b/testcases/features/doctor.py @@ -13,11 +13,9 @@ # 0.2: measure test duration and publish results under json format # # -import argparse -import os import time -import yaml +import argparse import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as functest_utils @@ -27,8 +25,7 @@ parser.add_argument("-r", "--report", action="store_true") args = parser.parse_args() -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) +functest_yaml = functest_utils.get_functest_yaml() dirs = functest_yaml.get('general').get('directories') DOCTOR_REPO = dirs.get('dir_repo_doctor') diff --git a/testcases/features/domino.py b/testcases/features/domino.py index 291a3b49b..cc98f546d 100755 --- a/testcases/features/domino.py +++ b/testcases/features/domino.py @@ -14,11 +14,9 @@ # 0.3: add report flag to push results when needed # -import argparse -import os import time -import yaml +import argparse import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as functest_utils @@ -29,8 +27,7 @@ parser.add_argument("-r", "--report", action="store_true") args = parser.parse_args() -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) +functest_yaml = functest_utils.get_functest_yaml() dirs = functest_yaml.get('general').get('directories') DOMINO_REPO = dirs.get('dir_repo_domino') diff --git a/testcases/features/promise.py b/testcases/features/promise.py index 3728adfe5..3f58dcee8 100755 --- a/testcases/features/promise.py +++ b/testcases/features/promise.py @@ -9,20 +9,18 @@ # # Maintainer : jose.lausuch@ericsson.com # -import argparse import json import os import subprocess import time +import argparse import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as functest_utils import functest.utils.openstack_utils as openstack_utils import keystoneclient.v2_0.client as ksclient -from neutronclient.v2_0 import client as ntclient import novaclient.client as nvclient -import yaml - +from neutronclient.v2_0 import client as ntclient parser = argparse.ArgumentParser() @@ -32,8 +30,7 @@ parser.add_argument("-r", "--report", action="store_true") args = parser.parse_args() -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) +functest_yaml = functest_utils.get_functest_yaml() dirs = functest_yaml.get('general').get('directories') PROMISE_REPO = dirs.get('dir_repo_promise') |