From f737eb4db5576189dd23059f2dab30d2e29441de Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Fri, 21 Aug 2026 08:11:34 +0200 Subject: [PATCH] fix: always returns YAML data even if it's empty (for layer purpose) --- src/rougail/user_data_yaml/__init__.py | 4 ++-- tests/result_tutorial/131/02_ro.json | 2 +- tests/result_tutorial/131/02_rw.json | 2 +- tests/result_tutorial/131/03_ro.json | 2 +- tests/result_tutorial/131/03_rw.json | 2 +- tests/result_tutorial/131/04_ro.json | 2 +- tests/result_tutorial/131/04_rw.json | 2 +- tests/result_tutorial/131/errors_02.json | 2 +- tests/result_tutorial/131/errors_03.json | 6 +++--- tests/result_tutorial/131/errors_04.json | 4 ++-- tests/results/00_7help/file/all.yml | 3 ++- tests/results/00_7help/file/all_exclude.yml | 3 ++- tests/results/00_7help/file/mandatories.yml | 3 ++- tests/results/00_7help/makedict/all.json | 3 ++- tests/results/00_7help/makedict/mandatories.json | 3 ++- tests/results/20_7help_family/file/all.yml | 3 +++ tests/results/20_7help_family/file/all_exclude.yml | 3 +++ tests/results/20_7help_family/file/mandatories.yml | 3 +++ tests/results/20_7help_family/makedict/all.json | 3 ++- tests/results/20_7help_family/makedict/mandatories.json | 3 ++- tests/test_load.py | 2 +- 21 files changed, 38 insertions(+), 22 deletions(-) diff --git a/src/rougail/user_data_yaml/__init__.py b/src/rougail/user_data_yaml/__init__.py index f6517d2..fd3a6e9 100644 --- a/src/rougail/user_data_yaml/__init__.py +++ b/src/rougail/user_data_yaml/__init__.py @@ -79,8 +79,8 @@ class RougailUserDataYaml: last_filename_idx = len(self.filenames) - 1 for idx, filename in enumerate(self.filenames): file_values = self.open(filename) - if not file_values: - continue + if file_values is None: + file_values = {} values = {} if not isinstance(file_values, dict): self.errors.append( diff --git a/tests/result_tutorial/131/02_ro.json b/tests/result_tutorial/131/02_ro.json index 6c25259..e675990 100644 --- a/tests/result_tutorial/131/02_ro.json +++ b/tests/result_tutorial/131/02_ro.json @@ -1,7 +1,7 @@ [ [ [ - "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', '__internal_description': 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", "proxy_dns_socks5", null ] diff --git a/tests/result_tutorial/131/02_rw.json b/tests/result_tutorial/131/02_rw.json index 6c25259..e675990 100644 --- a/tests/result_tutorial/131/02_rw.json +++ b/tests/result_tutorial/131/02_rw.json @@ -1,7 +1,7 @@ [ [ [ - "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', '__internal_description': 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", "proxy_dns_socks5", null ] diff --git a/tests/result_tutorial/131/03_ro.json b/tests/result_tutorial/131/03_ro.json index 6c25259..e675990 100644 --- a/tests/result_tutorial/131/03_ro.json +++ b/tests/result_tutorial/131/03_ro.json @@ -1,7 +1,7 @@ [ [ [ - "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', '__internal_description': 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", "proxy_dns_socks5", null ] diff --git a/tests/result_tutorial/131/03_rw.json b/tests/result_tutorial/131/03_rw.json index 6c25259..e675990 100644 --- a/tests/result_tutorial/131/03_rw.json +++ b/tests/result_tutorial/131/03_rw.json @@ -1,7 +1,7 @@ [ [ [ - "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', '__internal_description': 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", "proxy_dns_socks5", null ] diff --git a/tests/result_tutorial/131/04_ro.json b/tests/result_tutorial/131/04_ro.json index 6c25259..e675990 100644 --- a/tests/result_tutorial/131/04_ro.json +++ b/tests/result_tutorial/131/04_ro.json @@ -1,7 +1,7 @@ [ [ [ - "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', '__internal_description': 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", "proxy_dns_socks5", null ] diff --git a/tests/result_tutorial/131/04_rw.json b/tests/result_tutorial/131/04_rw.json index 6c25259..e675990 100644 --- a/tests/result_tutorial/131/04_rw.json +++ b/tests/result_tutorial/131/04_rw.json @@ -1,7 +1,7 @@ [ [ [ - "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', '__internal_description': 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", "proxy_dns_socks5", null ] diff --git a/tests/result_tutorial/131/errors_02.json b/tests/result_tutorial/131/errors_02.json index 73876f9..982d9ec 100644 --- a/tests/result_tutorial/131/errors_02.json +++ b/tests/result_tutorial/131/errors_02.json @@ -3,7 +3,7 @@ "warnings": [ [ [ - "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', '__internal_description': 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", "proxy_dns_socks5", null ] diff --git a/tests/result_tutorial/131/errors_03.json b/tests/result_tutorial/131/errors_03.json index 4a2bdce..81fff27 100644 --- a/tests/result_tutorial/131/errors_03.json +++ b/tests/result_tutorial/131/errors_03.json @@ -3,21 +3,21 @@ "warnings": [ [ [ - "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', '__internal_description': 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", "proxy_dns_socks5", null ] ], [ [ - "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', '__internal_description': 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", "proxy_dns_socks5", null ] ], [ [ - "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/131/config/03/config.yml\"", + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', '__internal_description': 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/131/config/03/config.yml\"", "proxy_dns_socks5", null ] diff --git a/tests/result_tutorial/131/errors_04.json b/tests/result_tutorial/131/errors_04.json index bfe2ea1..5f7eb11 100644 --- a/tests/result_tutorial/131/errors_04.json +++ b/tests/result_tutorial/131/errors_04.json @@ -3,14 +3,14 @@ "warnings": [ [ [ - "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', '__internal_description': 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", "proxy_dns_socks5", null ] ], [ [ - "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', '__internal_description': 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", "proxy_dns_socks5", null ] diff --git a/tests/results/00_7help/file/all.yml b/tests/results/00_7help/file/all.yml index aec7437..cc33587 100644 --- a/tests/results/00_7help/file/all.yml +++ b/tests/results/00_7help/file/all.yml @@ -1,6 +1,7 @@ { "rougail": { "var1": "string1", - "var2": "string1" + "var2": "string1", + "var3": "string1" } } \ No newline at end of file diff --git a/tests/results/00_7help/file/all_exclude.yml b/tests/results/00_7help/file/all_exclude.yml index aec7437..cc33587 100644 --- a/tests/results/00_7help/file/all_exclude.yml +++ b/tests/results/00_7help/file/all_exclude.yml @@ -1,6 +1,7 @@ { "rougail": { "var1": "string1", - "var2": "string1" + "var2": "string1", + "var3": "string1" } } \ No newline at end of file diff --git a/tests/results/00_7help/file/mandatories.yml b/tests/results/00_7help/file/mandatories.yml index aec7437..cc33587 100644 --- a/tests/results/00_7help/file/mandatories.yml +++ b/tests/results/00_7help/file/mandatories.yml @@ -1,6 +1,7 @@ { "rougail": { "var1": "string1", - "var2": "string1" + "var2": "string1", + "var3": "string1" } } \ No newline at end of file diff --git a/tests/results/00_7help/makedict/all.json b/tests/results/00_7help/makedict/all.json index 3471f52..2fbf52f 100644 --- a/tests/results/00_7help/makedict/all.json +++ b/tests/results/00_7help/makedict/all.json @@ -1,4 +1,5 @@ { "rougail.var1": "string1", - "rougail.var2": "string1" + "rougail.var2": "string1", + "rougail.var3": "string1" } diff --git a/tests/results/00_7help/makedict/mandatories.json b/tests/results/00_7help/makedict/mandatories.json index 3471f52..2fbf52f 100644 --- a/tests/results/00_7help/makedict/mandatories.json +++ b/tests/results/00_7help/makedict/mandatories.json @@ -1,4 +1,5 @@ { "rougail.var1": "string1", - "rougail.var2": "string1" + "rougail.var2": "string1", + "rougail.var3": "string1" } diff --git a/tests/results/20_7help_family/file/all.yml b/tests/results/20_7help_family/file/all.yml index 0c2ef99..3741143 100644 --- a/tests/results/20_7help_family/file/all.yml +++ b/tests/results/20_7help_family/file/all.yml @@ -5,6 +5,9 @@ }, "family2": { "var": "string1" + }, + "family3": { + "var": "string1" } } } \ No newline at end of file diff --git a/tests/results/20_7help_family/file/all_exclude.yml b/tests/results/20_7help_family/file/all_exclude.yml index 0c2ef99..3741143 100644 --- a/tests/results/20_7help_family/file/all_exclude.yml +++ b/tests/results/20_7help_family/file/all_exclude.yml @@ -5,6 +5,9 @@ }, "family2": { "var": "string1" + }, + "family3": { + "var": "string1" } } } \ No newline at end of file diff --git a/tests/results/20_7help_family/file/mandatories.yml b/tests/results/20_7help_family/file/mandatories.yml index 0c2ef99..3741143 100644 --- a/tests/results/20_7help_family/file/mandatories.yml +++ b/tests/results/20_7help_family/file/mandatories.yml @@ -5,6 +5,9 @@ }, "family2": { "var": "string1" + }, + "family3": { + "var": "string1" } } } \ No newline at end of file diff --git a/tests/results/20_7help_family/makedict/all.json b/tests/results/20_7help_family/makedict/all.json index 315cf64..61c5c77 100644 --- a/tests/results/20_7help_family/makedict/all.json +++ b/tests/results/20_7help_family/makedict/all.json @@ -1,4 +1,5 @@ { "rougail.family1.var": "string1", - "rougail.family2.var": "string1" + "rougail.family2.var": "string1", + "rougail.family3.var": "string1" } diff --git a/tests/results/20_7help_family/makedict/mandatories.json b/tests/results/20_7help_family/makedict/mandatories.json index 315cf64..61c5c77 100644 --- a/tests/results/20_7help_family/makedict/mandatories.json +++ b/tests/results/20_7help_family/makedict/mandatories.json @@ -1,4 +1,5 @@ { "rougail.family1.var": "string1", - "rougail.family2.var": "string1" + "rougail.family2.var": "string1", + "rougail.family3.var": "string1" } diff --git a/tests/test_load.py b/tests/test_load.py index fd73717..5ea3c39 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -19,7 +19,7 @@ excludes = [ '40_6leadership_follower_multi', # submulti is not allowed ] WITH_DONE = False -#WITH_DONE = True +WITH_DONE = True HERE = Path(__file__).parent