diff options
author | 2016-09-01 08:30:09 +0000 | |
---|---|---|
committer | 2016-09-01 08:30:09 +0000 | |
commit | c94a1c01e46b21f0139a8b1419f26c8b9f867a41 (patch) | |
tree | 0b1c11a9d286aefd1c015dac90d5acea94206678 /utils/functest_utils.py | |
parent | 5fbdcb8d13e63cec2614a9703f0b3f640f05aa49 (diff) | |
parent | f4d0a05011e961a363c6d99522684ecdeb959716 (diff) |
Merge "unify functest_yaml obtain process"
Diffstat (limited to 'utils/functest_utils.py')
-rw-r--r-- | utils/functest_utils.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/utils/functest_utils.py b/utils/functest_utils.py index 1f86bcd0..0fc6adf0 100644 --- a/utils/functest_utils.py +++ b/utils/functest_utils.py @@ -152,9 +152,7 @@ def get_db_url(): """ Returns DB URL """ - with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) - f.close() + functest_yaml = get_functest_yaml() db_url = functest_yaml.get("results").get("test_db_url") return db_url @@ -326,9 +324,7 @@ def get_deployment_dir(): """ Returns current Rally deployment directory """ - with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) - f.close() + functest_yaml = get_functest_yaml() deployment_name = functest_yaml.get("rally").get("deployment_name") rally_dir = functest_yaml.get("general").get("directories").get( "dir_rally_inst") @@ -434,3 +430,10 @@ def check_test_result(test_name, ret, start_time, stop_time): def get_testcases_file(): return FUNCTEST_REPO + "/ci/testcases.yaml" + + +def get_functest_yaml(): + with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: + functest_yaml = yaml.safe_load(f) + f.close() + return functest_yaml |