diff options
| author |   Chris Donley <christopher.donley@huawei.com> | 2018-03-14 14:18:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-14 14:18:27 +0000 |
| commit | 4951250edc384d1736669ec9f656ecca6aab5426 (patch) | |
| tree | d690c086bd29339cb88bf18bbb3da3de13010ac6 /vnftest/common/constants.py | |
| parent | ab3381d2e8a6207fa792d12ba516e5c6efa2dc27 (diff) | |
| parent | 30497ac60f062adba7dae751110dd9fc87ef04db (diff) | |
Merge "Onboard package test case"
Diffstat (limited to 'vnftest/common/constants.py')
| -rw-r--r-- | vnftest/common/constants.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vnftest/common/constants.py b/vnftest/common/constants.py index 9da64ba..8bbe070 100644 --- a/vnftest/common/constants.py +++ b/vnftest/common/constants.py @@ -38,11 +38,12 @@ VNFTEST_ROOT_PATH = dirname( def get_param(key, default=''): - # we have to defer this to runtime so that we can mock os.environ.get in unittests - default_path = os.path.join(VNFTEST_ROOT_PATH, "etc/vnftest/vnftest.yaml") - conf_file = os.environ.get('CONF_FILE', default_path) # don't re-parse yaml for each lookup if not CONF: + # we have to defer this to runtime so that we can mock os.environ.get in unittests + default_path = os.path.join(VNFTEST_ROOT_PATH, "etc/vnftest/vnftest.yaml") + conf_file = os.environ.get('CONF_FILE', default_path) + # do not use vnftest.common.utils.parse_yaml # since vnftest.common.utils creates a logger # and so it cannot be imported before this code |