diff --git a/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/tiramisu/base.py b/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/tiramisu/base.py index 3310514ca..c3dea72e2 100644 --- a/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/tiramisu/base.py +++ b/tests/dictionaries/60_6family_dynamic_sub_dynamic_empty/tiramisu/base.py @@ -10,7 +10,7 @@ except: ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") -dict_env['default_rougail.dyn{{ identifier }}.var'] = "{% for val in __.var %}\nt{{ val }}\n{% endfor %}\n" +dict_env['default_rougail.dyn{{ identifier }}.var'] = "{% for val in __.var %}\n {% if val is not none %}\nt{{ val }}\n {% endif %}\n{% endfor %}\n" dict_env['default_rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers'] = "{{ s1 }}-{{ s2 }}\n" option_2 = StrOption(name="var", doc="A identifier variable", multi=True, properties=frozenset({"standard"}), informations={'ymlfiles': ['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml'], 'type': 'string', 'test': ('val1', 'val2')}) option_4 = StrOption(name="var", doc="A dynamic variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.dyn{{ identifier }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.dyn{{ identifier }}.var"), '__.var': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'ymlfiles': ['../rougail-tests/structures/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml'], 'type': 'string'}) diff --git a/tests/test_1_flattener.py b/tests/test_1_flattener.py index 4046d6e25..99d2fa2e8 100644 --- a/tests/test_1_flattener.py +++ b/tests/test_1_flattener.py @@ -134,7 +134,7 @@ def save(test_dir, eolobj, multi=False, namespace=False, error=False): tiramisu_objects = fh.read() with open(tiramisu_file, 'r') as fh: tiramisu_objects_ori = fh.read() - assert tiramisu_objects == tiramisu_objects_ori + assert tiramisu_objects == tiramisu_objects_ori, f'{test_dir} -> {tiramisu_file}' if isdir(tiramisu_tmp_dir): rmtree(tiramisu_tmp_dir)