diff options
| author |   Lovett, Trevor <trevor.lovett@att.com> | 2019-10-29 11:33:26 -0500 |
|---|---|---|
| committer |   Lovett, Trevor (tl2972) <tl2972@att.com> | 2019-10-29 11:42:43 -0500 |
| commit | d87106650286493af38cecd423b58bdcead15db4 (patch) | |
| tree | 08637ba59b5bdccfcfada2d0f2a1d97f2c8097e4 | |
| parent | b3a5befeb0d5d9e348b1ba7b29f412b15544a0ec (diff) | |
[VVP] Make Preload Generation more reslient to failures
Ensure that errors during preload do not prevent validation
report creation
Issue-ID: VVP-335
Signed-off-by: Lovett, Trevor <trevor.lovett@att.com>
Change-Id: I0cfd411b6a034422e349b96c462e68a4f0ceb876
| -rw-r--r-- | ice_validator/preload/model.py | 3 | ||||
| -rw-r--r-- | ice_validator/tests/conftest.py | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ice_validator/preload/model.py b/ice_validator/preload/model.py index db60438..3ca7bda 100644 --- a/ice_validator/preload/model.py +++ b/ice_validator/preload/model.py @@ -251,7 +251,8 @@ def env_path(heat_path): :return: path to env file (assumes it is present and named correctly) """ base_path = os.path.splitext(heat_path)[0] - return "{}.env".format(base_path) + env_path = "{}.env".format(base_path) + return env_path if os.path.exists(env_path) else None class VnfModule(FilterBaseOutputs): diff --git a/ice_validator/tests/conftest.py b/ice_validator/tests/conftest.py index 3ef7fe1..9a839b5 100644 --- a/ice_validator/tests/conftest.py +++ b/ice_validator/tests/conftest.py @@ -348,7 +348,11 @@ def pytest_sessionfinish(session, exitstatus): def pytest_terminal_summary(terminalreporter, exitstatus): # Ensures all preload information and warnings appear after # test results - create_preloads(terminalreporter.config, exitstatus) + try: + create_preloads(terminalreporter.config, exitstatus) + except Exception: + print("Error creating preloads, skipping preload generation") + traceback.print_exc() # noinspection PyUnusedLocal |