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) --- testcases/OpenStack/tempest/run_tempest.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'testcases/OpenStack/tempest') diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index 306664feb..fbb65dbb7 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -60,9 +60,7 @@ logger = ft_logger.Logger("run_tempest").getLogger() REPO_PATH = os.environ['repos_dir'] + '/functest/' -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) -f.close() +functest_yaml = ft_utils.get_functest_yaml() TEST_DB = functest_yaml.get("results").get("test_db_url") MODE = "smoke" -- cgit 1.2.3-korg