diff --git a/src/rougail/user_data_yaml/__init__.py b/src/rougail/user_data_yaml/__init__.py index 9175c50..6944a36 100644 --- a/src/rougail/user_data_yaml/__init__.py +++ b/src/rougail/user_data_yaml/__init__.py @@ -19,7 +19,7 @@ along with this program. If not, see . from ruamel.yaml import YAML from pathlib import Path -from rougail.error import ExtentionError +from rougail.error import ExtensionError from tiramisu.error import ValueOptionError, PropertiesOptionError, LeadershipError from .i18n import _ @@ -43,7 +43,7 @@ class RougailUserDataYaml: rougailconfig["step.user_data"] = user_data user_data = rougailconfig["step.user_data"] if "yaml" not in user_data: - raise ExtentionError(_("yaml is not set in step.user_data")) + raise ExtensionError(_("yaml is not set in step.user_data")) self.rougailconfig = rougailconfig self.filenames = self.rougailconfig["yaml.filename"] self.file_with_secrets = self.rougailconfig["yaml.file_with_secrets"] diff --git a/src/rougail/user_data_yaml/config.py b/src/rougail/user_data_yaml/config.py index 919327d..13dfb5d 100644 --- a/src/rougail/user_data_yaml/config.py +++ b/src/rougail/user_data_yaml/config.py @@ -36,7 +36,7 @@ yaml: filename: description: {_("File or directory name where user datas are stored")} - alternative_name: ff + alternative_name: yf type: unix_filename multi: true params: diff --git a/tests/results/00_6port/file/all.yml b/tests/results/00_6port/file/all.yml index c8eb43e..084923a 100644 --- a/tests/results/00_6port/file/all.yml +++ b/tests/results/00_6port/file/all.yml @@ -1,7 +1,7 @@ { "rougail": { - "variable1": "80", - "variable2": "80", - "variable3": "80" + "variable1": 80, + "variable2": 80, + "variable3": 80 } } \ No newline at end of file diff --git a/tests/results/00_6port/file/all_exclude.yml b/tests/results/00_6port/file/all_exclude.yml index c8eb43e..084923a 100644 --- a/tests/results/00_6port/file/all_exclude.yml +++ b/tests/results/00_6port/file/all_exclude.yml @@ -1,7 +1,7 @@ { "rougail": { - "variable1": "80", - "variable2": "80", - "variable3": "80" + "variable1": 80, + "variable2": 80, + "variable3": 80 } } \ No newline at end of file diff --git a/tests/results/00_6port/file/mandatories.yml b/tests/results/00_6port/file/mandatories.yml index 92a56fe..817c32e 100644 --- a/tests/results/00_6port/file/mandatories.yml +++ b/tests/results/00_6port/file/mandatories.yml @@ -1,5 +1,5 @@ { "rougail": { - "variable1": "80" + "variable1": 80 } } \ No newline at end of file diff --git a/tests/results/01_6string_multi_length/errors/all.json b/tests/results/01_6string_multi_length/errors/all.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/results/01_6string_multi_length/errors/all.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/results/01_6string_multi_length/errors/mandatories.json b/tests/results/01_6string_multi_length/errors/mandatories.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/results/01_6string_multi_length/errors/mandatories.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/results/01_6string_multi_length/file/all.yml b/tests/results/01_6string_multi_length/file/all.yml new file mode 100644 index 0000000..b5bde4a --- /dev/null +++ b/tests/results/01_6string_multi_length/file/all.yml @@ -0,0 +1,14 @@ +{ + "rougail": { + "var1": [ + "string1", + "string2", + "string3" + ], + "var2": [ + "string1", + "string2", + "string3" + ] + } +} \ No newline at end of file diff --git a/tests/results/01_6string_multi_length/file/all_exclude.yml b/tests/results/01_6string_multi_length/file/all_exclude.yml new file mode 100644 index 0000000..b5bde4a --- /dev/null +++ b/tests/results/01_6string_multi_length/file/all_exclude.yml @@ -0,0 +1,14 @@ +{ + "rougail": { + "var1": [ + "string1", + "string2", + "string3" + ], + "var2": [ + "string1", + "string2", + "string3" + ] + } +} \ No newline at end of file diff --git a/tests/results/01_6string_multi_length/file/mandatories.yml b/tests/results/01_6string_multi_length/file/mandatories.yml new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/tests/results/01_6string_multi_length/file/mandatories.yml @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/tests/results/01_6string_multi_length/makedict/all.json b/tests/results/01_6string_multi_length/makedict/all.json new file mode 100644 index 0000000..e8b793c --- /dev/null +++ b/tests/results/01_6string_multi_length/makedict/all.json @@ -0,0 +1,12 @@ +{ + "rougail.var1": [ + "string1", + "string2", + "string3" + ], + "rougail.var2": [ + "string1", + "string2", + "string3" + ] +} diff --git a/tests/results/01_6string_multi_length/makedict/mandatories.json b/tests/results/01_6string_multi_length/makedict/mandatories.json new file mode 100644 index 0000000..900e90f --- /dev/null +++ b/tests/results/01_6string_multi_length/makedict/mandatories.json @@ -0,0 +1,11 @@ +{ + "rougail.var1": [ + "val1", + "val2", + "val3" + ], + "rougail.var2": [ + "val4", + "val5" + ] +} diff --git a/tests/results/60_5family_dynamic_calc_description/errors/all.json b/tests/results/60_5family_dynamic_calc_description/errors/all.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/results/60_5family_dynamic_calc_description/errors/all.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_calc_description/file/all.yml b/tests/results/60_5family_dynamic_calc_description/file/all.yml new file mode 100644 index 0000000..a487e1d --- /dev/null +++ b/tests/results/60_5family_dynamic_calc_description/file/all.yml @@ -0,0 +1,16 @@ +{ + "rougail": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + }, + "var1": "string1", + "var2": [ + "string1", + "string2", + "string3" + ] + } +} \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_calc_description/file/all_exclude.yml b/tests/results/60_5family_dynamic_calc_description/file/all_exclude.yml new file mode 100644 index 0000000..a487e1d --- /dev/null +++ b/tests/results/60_5family_dynamic_calc_description/file/all_exclude.yml @@ -0,0 +1,16 @@ +{ + "rougail": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + }, + "var1": "string1", + "var2": [ + "string1", + "string2", + "string3" + ] + } +} \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_calc_description/file/mandatories.yml b/tests/results/60_5family_dynamic_calc_description/file/mandatories.yml new file mode 100644 index 0000000..8a35da1 --- /dev/null +++ b/tests/results/60_5family_dynamic_calc_description/file/mandatories.yml @@ -0,0 +1,11 @@ +{ + "rougail": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + }, + "var1": "string1" + } +} \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_calc_description/makedict/all.json b/tests/results/60_5family_dynamic_calc_description/makedict/all.json new file mode 100644 index 0000000..006ab6c --- /dev/null +++ b/tests/results/60_5family_dynamic_calc_description/makedict/all.json @@ -0,0 +1,10 @@ +{ + "rougail.dynval1.var": "string1", + "rougail.dynval2.var": "string1", + "rougail.var1": "string1", + "rougail.var2": [ + "string1", + "string2", + "string3" + ] +} diff --git a/tests/test_invalid.py b/tests/test_invalid.py index 81cb6d1..0c1621d 100644 --- a/tests/test_invalid.py +++ b/tests/test_invalid.py @@ -24,7 +24,6 @@ def _test_invalid_no_error(filename): ufilename = ifilename generated_user_data = RougailUserDataYaml(config, rougailconfig=rougailconfig).run() errors = rougail.user_datas(generated_user_data, invalid_user_datas_error=invalid_user_datas_error, unknown_user_datas_error=unknown_user_datas_error) - print(errors) #expected output expected_filename = Path('tests') / 'invalid' / 'results' / ufilename / "errors.json" if not expected_filename.is_file(): diff --git a/tests/test_load.py b/tests/test_load.py index d1001c7..aeeb7e9 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -20,7 +20,7 @@ excludes = [ ] test_ok = get_structures_list(excludes) -# test_ok = [Path('../rougail-tests/structures/60_0family_dynamic_source_hidden')] +# test_ok = [Path('../rougail-tests/structures/00_6port')] def idfn(fixture_value):