aboutsummaryrefslogtreecommitdiffstats
path: root/ice_validator/tests/parametrizers.py
diff options
context:
space:
mode:
authorLovett, Trevor <trevor.lovett@att.com>2019-08-27 12:40:36 -0500
committerLovett, Trevor (tl2972) <tl2972@att.com>2019-08-27 16:02:47 -0500
commit84db7f8f65cd0ec77f09cfde365599df9890ce6c (patch)
treeeadedec4cb5f0db131442a6e594a5b8c61ee50cf /ice_validator/tests/parametrizers.py
parentb1df832ae5ddaac6344b7ccf3f1f32a0bcfbdd67 (diff)
[VVP] Generated completed preload from env files
User can supply an optional directory containing .env files and/or CSAR VSP which can be used to generate populated preloads in the requested format. The nested directories can be used to create sub-environments that inherit their settings from the parent directories. Optionally, values can be specified in a defaults.yaml and they will be used if that value is not defined in the .env file. This is useful if the parameter name and value will be the same in all modules. Issue-ID: VVP-278 Change-Id: Icd9846c63463537793db908be8ce5dba13c4bda3 Signed-off-by: Lovett, Trevor <trevor.lovett@att.com>
Diffstat (limited to 'ice_validator/tests/parametrizers.py')
-rw-r--r--ice_validator/tests/parametrizers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ice_validator/tests/parametrizers.py b/ice_validator/tests/parametrizers.py
index 35cf6e0..763296c 100644
--- a/ice_validator/tests/parametrizers.py
+++ b/ice_validator/tests/parametrizers.py
@@ -58,7 +58,7 @@ def get_template_dir(metafunc):
or, during --self-test, the directory whos name matches
the current tests module name
"""
- if metafunc.config.getoption("template_dir") is None:
+ if metafunc.config.getoption("template_dir", None) is None:
return path.join(
path.dirname(metafunc.module.__file__),
"fixtures",
@@ -155,7 +155,7 @@ def get_filenames_lists(
"""
extensions = [".yaml", ".yml", ".env"] if extensions is None else extensions
filenames_lists = []
- if metafunc.config.getoption("self_test"):
+ if metafunc.config.getoption("self_test", None):
filenames_lists.append(
list_template_dir(
metafunc, extensions, exclude_nested, template_type, ["pass"]