From 4a803db9fa32c42559306da22beaab437d664fdc Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Wed, 31 Aug 2016 10:22:33 +0800 Subject: 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 (cherry picked from commit f4d0a05011e961a363c6d99522684ecdeb959716) --- cli/commands/cli_testcase.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'cli/commands/cli_testcase.py') diff --git a/cli/commands/cli_testcase.py b/cli/commands/cli_testcase.py index d1b248297..498f08132 100644 --- a/cli/commands/cli_testcase.py +++ b/cli/commands/cli_testcase.py @@ -15,11 +15,8 @@ import click import functest.ci.tier_builder as tb import functest.utils.functest_utils as ft_utils import functest.utils.functest_vacation as vacation -import yaml - -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) +functest_yaml = ft_utils.get_functest_yaml() FUNCTEST_CONF_DIR = functest_yaml.get("general").get( "directories").get("dir_functest_conf") -- cgit 1.2.3-korg