X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vvp%2Fvalidation-scripts.git;a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_environment_file_parameters.py;h=010edabc1559de6397f64470cebcba3924ce2197;hp=34808b9d1697dd24d04d852d89869cd002955927;hb=f40ff1bf5c95696f78ec6ff1862e6954f360a04f;hpb=9ccbfe7e20b3914c37c0dec50762cec9da8a63c6 diff --git a/ice_validator/tests/test_environment_file_parameters.py b/ice_validator/tests/test_environment_file_parameters.py index 34808b9..010edab 100644 --- a/ice_validator/tests/test_environment_file_parameters.py +++ b/ice_validator/tests/test_environment_file_parameters.py @@ -39,6 +39,7 @@ """ environment file structure """ import os +from collections import Iterable from tests.structures import Heat from tests.utils import nested_dict @@ -228,15 +229,21 @@ def run_check_resource_parameter( if kwargs.get("resource_type_inverse"): resource_type = "non-{}".format(resource_type) + params = ( + ": {}".format(", ".join(invalid_parameters)) + if isinstance(invalid_parameters, Iterable) + else "" + ) + assert not invalid_parameters, ( "{} {} parameters in template {}{}" - " found in {} environment file: {}".format( + " found in {} environment file{}".format( resource_type, prop, filename, " not" if DESIRED else "", environment_pair.get("name"), - ", ".join(invalid_parameters), + params, ) )