diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-08-31 10:22:33 +0800 |
|---|---|---|
| committer |   Jose Lausuch <jose.lausuch@ericsson.com> | 2016-09-02 07:54:09 +0000 |
| commit | 4a803db9fa32c42559306da22beaab437d664fdc (patch) | |
| tree | 0984ed984f3397f4f0a695353c069d472efbc389 /ci | |
| parent | cc315c6534d27c24fe543b33e2ac9f66cda83d38 (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>
(cherry picked from commit f4d0a05011e961a363c6d99522684ecdeb959716)
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/prepare_env.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ci/prepare_env.py b/ci/prepare_env.py index 116b1a6e2..b8c536f1a 100755 --- a/ci/prepare_env.py +++ b/ci/prepare_env.py @@ -50,8 +50,7 @@ CONFIG_FUNCTEST_PATH = os.environ["CONFIG_FUNCTEST_YAML"] CONFIG_PATCH_PATH = os.path.join(os.path.dirname( CONFIG_FUNCTEST_PATH), "config_patch.yaml") -with open(CONFIG_FUNCTEST_PATH) as f: - functest_yaml = yaml.safe_load(f) +functest_yaml = ft_utils.get_functest_yaml() with open(CONFIG_PATCH_PATH) as f: functest_patch_yaml = yaml.safe_load(f) |