From 91689904fcdb0a94d60eaf3f6ea1cd92a03026d6 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Fri, 19 May 2023 12:56:13 +0200 Subject: [PATCH] rougail use tiramisu4 --- src/rougail/__init__.py | 14 +- src/rougail/annotator/param.py | 2 +- src/rougail/annotator/service.py | 2 +- src/rougail/annotator/target.py | 2 +- src/rougail/template/base.py | 174 +++++++++--------- src/rougail/tiramisu.py | 2 +- src/rougail/tiramisureflector.py | 4 +- .../00load_autofreeze/tiramisu/base.py | 2 +- .../00load_autofreeze/tiramisu/multi.py | 4 +- .../00load_autofreezeexpert/tiramisu/base.py | 2 +- .../00load_autofreezeexpert/tiramisu/multi.py | 4 +- .../01auto_autofreeze/tiramisu/base.py | 2 +- .../01auto_autofreeze/tiramisu/multi.py | 4 +- .../01fill_autofreeze/tiramisu/base.py | 2 +- .../01fill_autofreeze/tiramisu/multi.py | 4 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../10leadership_append/makedict/after.json | 12 -- .../10leadership_append/makedict/before.json | 12 -- .../makedict/after.json | 12 -- .../makedict/before.json | 12 -- .../makedict/after.json | 12 -- .../makedict/before.json | 12 -- .../10leadership_auto/makedict/after.json | 12 -- .../10leadership_auto/makedict/before.json | 12 -- .../makedict/after.json | 8 - .../makedict/before.json | 8 - .../makedict/after.json | 8 - .../makedict/before.json | 8 - .../makedict/after.json | 8 - .../makedict/before.json | 8 - .../makedict/after.json | 8 - .../makedict/before.json | 8 - .../makedict/after.json | 8 - .../makedict/before.json | 8 - .../tiramisu/base.py | 8 +- .../tiramisu/multi.py | 16 +- .../makedict/after.json | 8 - .../makedict/before.json | 8 - .../tiramisu/base.py | 8 +- .../tiramisu/multi.py | 16 +- .../makedict/after.json | 8 - .../makedict/before.json | 8 - .../makedict/after.json | 8 - .../makedict/before.json | 8 - .../makedict/after.json | 4 - .../makedict/before.json | 4 - .../makedict/after.json | 4 - .../makedict/before.json | 4 - .../10leadership_multi/makedict/after.json | 16 -- .../10leadership_multi/makedict/before.json | 16 -- .../10load_disabled_if_in/tiramisu/base.py | 4 +- .../10load_disabled_if_in/tiramisu/multi.py | 8 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../10load_frozenifin/tiramisu/base.py | 4 +- .../10load_frozenifin/tiramisu/multi.py | 8 +- .../10load_frozenifin_auto/tiramisu/base.py | 4 +- .../10load_frozenifin_auto/tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../10load_frozenifnotin/tiramisu/base.py | 4 +- .../10load_frozenifnotin/tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../10load_hidden_if_family/tiramisu/base.py | 8 +- .../10load_hidden_if_family/tiramisu/multi.py | 16 +- .../10load_leadership/makedict/after.json | 8 - .../10load_leadership/makedict/before.json | 8 - .../makedict/after.json | 8 - .../makedict/before.json | 8 - .../makedict/after.json | 8 - .../makedict/before.json | 8 - .../makedict/after.json | 8 - .../makedict/before.json | 8 - .../makedict/after.json | 8 - .../makedict/before.json | 8 - .../10load_mandatoryifin/tiramisu/base.py | 4 +- .../10load_mandatoryifin/tiramisu/multi.py | 8 +- .../10valid_enum_leader/makedict/after.json | 8 - .../10valid_enum_leader/makedict/before.json | 8 - .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../20family_disabled/makedict/after.json | 3 +- .../20family_disabled/makedict/base.json | 3 +- .../20family_disabled/makedict/before.json | 3 +- .../20family_dynamic_calc2/tiramisu/base.py | 4 +- .../20family_dynamic_calc2/tiramisu/multi.py | 8 +- .../makedict/after.json | 16 -- .../makedict/before.json | 16 -- .../makedict/after.json | 8 - .../makedict/before.json | 8 - .../40condition_base/tiramisu/base.py | 4 +- .../40condition_base/tiramisu/multi.py | 8 +- .../40condition_base_add/tiramisu/base.py | 4 +- .../40condition_base_add/tiramisu/multi.py | 8 +- .../40condition_optional/tiramisu/base.py | 2 +- .../40condition_optional/tiramisu/multi.py | 4 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../40ifin_leadership/makedict/after.json | 4 - .../40ifin_leadership/makedict/before.json | 4 - .../40ifin_leadership/tiramisu/base.py | 2 +- .../40ifin_leadership/tiramisu/multi.py | 4 +- .../40ifin_leadershipauto/tiramisu/base.py | 2 +- .../40ifin_leadershipauto/tiramisu/multi.py | 4 +- .../makedict/after.json | 2 +- .../makedict/before.json | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../40ifin_multi/tiramisu/base.py | 2 +- .../40ifin_multi/tiramisu/multi.py | 4 +- .../40ifin_multi2/tiramisu/base.py | 2 +- .../40ifin_multi2/tiramisu/multi.py | 4 +- .../51redefine_family/tiramisu/base.py | 2 +- .../51redefine_family/tiramisu/multi.py | 4 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../61extra_auto_freeze/tiramisu/base.py | 2 +- .../61extra_auto_freeze/tiramisu/multi.py | 4 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../70services_ip_iplist/tiramisu/base.py | 2 +- .../70services_ip_iplist/tiramisu/multi.py | 4 +- .../makedict/after.json | 4 +- .../makedict/before.json | 4 +- tests/test_2_makedict.py | 70 ++++--- tests/test_3_template.py | 58 +++--- 168 files changed, 416 insertions(+), 849 deletions(-) diff --git a/src/rougail/__init__.py b/src/rougail/__init__.py index 78800ccf0..416c1a777 100644 --- a/src/rougail/__init__.py +++ b/src/rougail/__init__.py @@ -45,22 +45,22 @@ class Rougail: self.converted = RougailConvert(self.rougailconfig) self.config = None - async def get_config(self): + def get_config(self): if not self.config: tiram_obj = self.converted.save(None) optiondescription = {} exec(tiram_obj, None, optiondescription) - self.config = await Config(optiondescription['option_0']) + self.config = Config(optiondescription['option_0']) return self.config - async def template(self, - type: str='base', - ) -> None: - config = await self.get_config() + def template(self, + type: str='base', + ) -> None: + config = self.get_config() if type == 'base': engine = RougailBaseTemplate(config, self.rougailconfig) else: engine = RougailSystemdTemplate(config, self.rougailconfig) - await engine.instance_files() + engine.instance_files() __ALL__ = ('Rougail', 'RougailConvert', 'RougailBaseTemplate', 'RougailSystemdTemplate', 'RougailConfig', 'RougailUpgrade') diff --git a/src/rougail/annotator/param.py b/src/rougail/annotator/param.py index 7529cf58f..56baf8c23 100644 --- a/src/rougail/annotator/param.py +++ b/src/rougail/annotator/param.py @@ -28,7 +28,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ try: - import tiramisu3 as tiramisu + import tiramisu4 as tiramisu except ModuleNotFoundError: import tiramisu diff --git a/src/rougail/annotator/service.py b/src/rougail/annotator/service.py index 7f0e8e207..0f6f93951 100644 --- a/src/rougail/annotator/service.py +++ b/src/rougail/annotator/service.py @@ -35,7 +35,7 @@ from rougail.utils import normalize_family from rougail.error import DictConsistencyError from rougail.annotator.variable import CONVERT_OPTION try: - import tiramisu3 as tiramisu + import tiramisu4 as tiramisu except ModuleNotFoundError: import tiramisu # a object's attribute has some annotations diff --git a/src/rougail/annotator/target.py b/src/rougail/annotator/target.py index 7be551712..0f9938794 100644 --- a/src/rougail/annotator/target.py +++ b/src/rougail/annotator/target.py @@ -50,7 +50,7 @@ class TargetAnnotator(Walk): for index, target in enumerate(obj.target): # test if it's redefined calculation if self.target_is_uniq and target.name in targets: - msg = _(f'A fill already exists for the target of "{target.name.path}" created') + msg = _(f'A fill already exists for the target of "{target.name}" created') raise DictConsistencyError(msg, 24, obj.xmlfiles) targets.append(target.name) diff --git a/src/rougail/template/base.py b/src/rougail/template/base.py index 6ba0ef854..84d73c6f2 100644 --- a/src/rougail/template/base.py +++ b/src/rougail/template/base.py @@ -37,9 +37,9 @@ from os.path import dirname, join, isfile, isdir, abspath try: - from tiramisu3 import Config, undefined - from tiramisu3.api import TiramisuOption - from tiramisu3.error import PropertiesOptionError # pragma: no cover + from tiramisu4 import Config, undefined + from tiramisu4.api import TiramisuOption + from tiramisu4.error import PropertiesOptionError # pragma: no cover except ModuleNotFoundError: # pragma: no cover from tiramisu import Config, undefined from tiramisu.api import TiramisuOption @@ -161,17 +161,17 @@ class RougailLeader: def __contains__(self, value): return self._value.__contains__(value) - async def _add_follower(self, - config, - name: str, - path: str, - ): + def _add_follower(self, + config, + name: str, + path: str, + ): """Add a new follower """ self._follower[name] = [] for index in range(len(self._value)): try: - value = await config.option(path, index).value.get() + value = config.option(path, index).value.get() except PropertiesOptionError as err: value = err self._follower[name].append(value) @@ -359,9 +359,13 @@ class RougailBaseTemplate: destfilenames.append(destfilename) return destfilenames - async def load_variables(self, with_flatten=True): - for option in await self.config.option.list(type='all'): - namespace = await option.option.name() + def load_variables(self, with_flatten=True): + if isinstance(self.config, Config): + list_options = self.config.option.list(type='all') + else: + list_options = self.config.list(type='all') + for option in list_options: + namespace = option.option.name() if with_flatten and namespace == self.rougailconfig['variable_namespace']: is_variable_namespace = True else: @@ -370,27 +374,27 @@ class RougailBaseTemplate: is_service_namespace = 'root' else: is_service_namespace = False - self.rougail_variables_dict[namespace] = await self._load_variables(option, - is_variable_namespace, - is_service_namespace, - ) + self.rougail_variables_dict[namespace] = self._load_variables(option, + is_variable_namespace, + is_service_namespace, + ) - async def instance_file(self, - template_name, - extra_variables=None, - ) -> None: + def instance_file(self, + template_name, + extra_variables=None, + ) -> None: if not self.rougail_variables_dict: - await self.load_variables() + self.load_variables() self.prepare_templates() - for service_obj in await self.config.option('services').list('all'): - service_name = await service_obj.option.description() - service_desactived = await service_obj.option('activate').value.get() is False - for fills in await service_obj.list('optiondescription'): - type_ = await fills.option.name() - for fill_obj in await fills.list('all'): - fill = await fill_obj.value.dict() + for service_obj in self.config.option('services').list('all'): + service_name = service_obj.option.description() + service_desactived = service_obj.option('activate').value.get() is False + for fills in service_obj.list('optiondescription'): + type_ = fills.option.name() + for fill_obj in fills.list('all'): + fill = {path.split('.')[-1]: value for path, value in fill_obj.value.dict().items()} self.get_default(type_, fill, fill_obj) - await self.get_informations(type_, fill, fill_obj) + self.get_informations(type_, fill, fill_obj) if fill['source'] != template_name: continue if service_desactived: @@ -420,9 +424,9 @@ class RougailBaseTemplate: raise TemplateError(f'Cannot find template {template_name}') - async def instance_files(self, - extra_variables=None, - ) -> None: + def instance_files(self, + extra_variables=None, + ) -> None: """Run templatisation on all files """ try: @@ -432,36 +436,36 @@ class RougailBaseTemplate: chdir(self.tmp_dir) try: if not self.rougail_variables_dict: - await self.load_variables() + self.load_variables() self.prepare_templates() files_to_delete = [] for included in (True, False): - for service_obj in await self.config.option('services').list('all'): - service_name = await service_obj.option.description() - if await service_obj.option('activate').value.get() is False: - if included is False and not await service_obj.information.get('undisable', False): + for service_obj in self.config.option('services').list('all'): + service_name = service_obj.option.description() + if service_obj.option('activate').value.get() is False: + if included is False and not service_obj.information.get('undisable', False): self.desactive_service(service_name) continue if not included: - engine = await service_obj.information.get('engine', None) + engine = service_obj.information.get('engine', None) if engine: self._instance_file({'engine': engine}, 'service', service_name, extra_variables, ) - target_name = await service_obj.information.get('target', None) + target_name = service_obj.information.get('target', None) if target_name: self.target_service(service_name, target_name, engine is None, ) - for fills in await service_obj.list('optiondescription'): - type_ = await fills.option.name() - for fill_obj in await fills.list('all'): - fill = await fill_obj.value.dict() + for fills in service_obj.list('optiondescription'): + type_ = fills.option.name() + for fill_obj in fills.list('all'): + fill = {path.split('.')[-1]: value for path, value in fill_obj.value.dict().items()} self.get_default(type_, fill, fill_obj) - await self.get_informations(type_, fill, fill_obj) + self.get_informations(type_, fill, fill_obj) if 'included' in fill: if (fill['included'] == 'no' and included is True) or \ (fill['included'] != 'no' and included is False): @@ -515,11 +519,11 @@ class RougailBaseTemplate: default_value = undefined dico[key] = dico.get(key, default_value) - async def get_informations(self, - type_: str, - dico: dict, - obj: 'Option', - ) -> None: + def get_informations(self, + type_: str, + dico: dict, + obj: 'Option', + ) -> None: for key in INFORMATIONS.get(type_, []): if key == 'target': default_value = None @@ -533,9 +537,9 @@ class RougailBaseTemplate: default_value = RougailConfig[default_key] else: default_value = undefined - value = await obj.information.get(key, default_value) + value = obj.information.get(key, default_value) if key not in ['target', 'undisable'] or value != default_value: - dico[key] = await obj.information.get(key, default_value) + dico[key] = obj.information.get(key, default_value) def desactive_service(self, *args, @@ -609,54 +613,54 @@ class RougailBaseTemplate: ) -> None: # pragma: no cover pass - async def _load_variables(self, - optiondescription, - is_variable_namespace: str, - is_service_namespace: str, - ) -> RougailExtra: + def _load_variables(self, + optiondescription, + is_variable_namespace: str, + is_service_namespace: str, + ) -> RougailExtra: """Load all variables and set it in RougailExtra objects """ variables = {} if isinstance(self.config, TiramisuOption): - len_root_path = len(await self.config.option.path()) + 1 - for option in await optiondescription.list('all'): - if await option.option.isoptiondescription(): - if await option.option.isleadership(): - for idx, suboption in enumerate(await option.list('all')): + len_root_path = len(self.config.option.path()) + 1 + for option in optiondescription.list('all'): + if option.option.isoptiondescription(): + if option.option.isleadership(): + for idx, suboption in enumerate(option.list('all')): if idx == 0: - leader_name = await suboption.option.name() - leader = RougailLeader(leader_name, await suboption.value.get()) - leadership_name = await option.option.name() + leader_name = suboption.option.name() + leader = RougailLeader(leader_name, suboption.value.get()) + leadership_name = option.option.name() if is_variable_namespace: - self.rougail_variables_dict[await suboption.option.name()] = leader + self.rougail_variables_dict[suboption.option.name()] = leader else: if isinstance(self.config, TiramisuOption): - path = (await suboption.option.path())[len_root_path:] + path = (suboption.option.path())[len_root_path:] else: - path = await suboption.option.path() - await leader._add_follower(self.config, - await suboption.option.name(), - path, - ) - variables[leadership_name] = RougailExtra(await option.option.name(), {leader_name: leader}, await option.option.path()) + path = suboption.option.path() + leader._add_follower(self.config, + suboption.option.name(), + path, + ) + variables[leadership_name] = RougailExtra(option.option.name(), {leader_name: leader}, option.option.path()) else: if is_service_namespace == 'root': new_is_service_namespace = 'service_name' elif is_service_namespace == 'service_name': - new_is_service_namespace = await option.option.name() + new_is_service_namespace = option.option.name() elif is_service_namespace in INFORMATIONS: # remove 's' new_is_service_namespace = is_service_namespace[:-1] else: new_is_service_namespace = is_service_namespace - subfamilies = await self._load_variables(option, - is_variable_namespace, - new_is_service_namespace, - ) - variables[await option.option.name()] = subfamilies + subfamilies = self._load_variables(option, + is_variable_namespace, + new_is_service_namespace, + ) + variables[option.option.name()] = subfamilies else: - name = await option.option.name() - value = await option.value.get() + name = option.option.name() + value = option.value.get() if is_variable_namespace: self.rougail_variables_dict[name] = value variables[name] = value @@ -665,8 +669,8 @@ class RougailBaseTemplate: variables, optiondescription, ) - await self.get_informations(is_service_namespace + 's', - variables, - optiondescription, - ) - return RougailExtra(await optiondescription.option.name(), variables, await optiondescription.option.path()) + self.get_informations(is_service_namespace + 's', + variables, + optiondescription, + ) + return RougailExtra(optiondescription.option.name(), variables, optiondescription.option.path()) diff --git a/src/rougail/tiramisu.py b/src/rougail/tiramisu.py index 717e0cfce..cb00fef5d 100644 --- a/src/rougail/tiramisu.py +++ b/src/rougail/tiramisu.py @@ -28,7 +28,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ try: - from tiramisu3 import DynOptionDescription + from tiramisu4 import DynOptionDescription except ModuleNotFoundError: from tiramisu import DynOptionDescription from .utils import normalize_family diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index de54e5540..2174fe2c3 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -91,7 +91,7 @@ class TiramisuReflector: for func in internal_functions: self.text['header'].append(f"setattr(func, '{func}', {func})") self.text['header'].extend(["try:", - " from tiramisu3 import *", + " from tiramisu4 import *", "except:", " from tiramisu import *", ]) @@ -280,7 +280,7 @@ class Common: """Populate properties """ option_name = child.source.reflector_object.get(self.calls, self.elt.path, 'property') - kwargs = (f"'condition': ParamOption({option_name}, todict=True, notraisepropertyerror=True), " + kwargs = (f"'condition': ParamOption({option_name}, notraisepropertyerror=True), " f"'expected': {self.populate_param(child.expected)}") if child.inverse: kwargs += ", 'reverse_condition': ParamValue(True)" diff --git a/tests/dictionaries/00load_autofreeze/tiramisu/base.py b/tests/dictionaries/00load_autofreeze/tiramisu/base.py index 3c9f5dc5e..7c7287967 100644 --- a/tests/dictionaries/00load_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreeze/tiramisu/base.py @@ -19,6 +19,6 @@ try: except: from tiramisu import * option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_1 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_1 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/00load_autofreeze/tiramisu/multi.py b/tests/dictionaries/00load_autofreeze/tiramisu/multi.py index fc5f546d0..cf0fbf1b9 100644 --- a/tests/dictionaries/00load_autofreeze/tiramisu/multi.py +++ b/tests/dictionaries/00load_autofreeze/tiramisu/multi.py @@ -19,11 +19,11 @@ try: except: from tiramisu import * option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_1 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_1 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_3 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5, optiondescription_7]) diff --git a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py index f89a6edea..3e180b602 100644 --- a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py @@ -19,6 +19,6 @@ try: except: from tiramisu import * option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_1 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_1 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/00load_autofreezeexpert/tiramisu/multi.py b/tests/dictionaries/00load_autofreezeexpert/tiramisu/multi.py index ff66a2573..2bb088893 100644 --- a/tests/dictionaries/00load_autofreezeexpert/tiramisu/multi.py +++ b/tests/dictionaries/00load_autofreezeexpert/tiramisu/multi.py @@ -19,11 +19,11 @@ try: except: from tiramisu import * option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_1 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_1 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_3 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5, optiondescription_7]) diff --git a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py index d6d47e807..246dc1a25 100644 --- a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py @@ -19,6 +19,6 @@ try: except: from tiramisu import * option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_2 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_2 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01auto_autofreeze/tiramisu/multi.py b/tests/dictionaries/01auto_autofreeze/tiramisu/multi.py index c5c0061a9..89f92fa8a 100644 --- a/tests/dictionaries/01auto_autofreeze/tiramisu/multi.py +++ b/tests/dictionaries/01auto_autofreeze/tiramisu/multi.py @@ -19,11 +19,11 @@ try: except: from tiramisu import * option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_2 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_2 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_3 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_4 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5, optiondescription_7]) diff --git a/tests/dictionaries/01fill_autofreeze/tiramisu/base.py b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py index 2da63cffc..b66c05da8 100644 --- a/tests/dictionaries/01fill_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py @@ -20,6 +20,6 @@ except: from tiramisu import * option_2 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal"})) option_3 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_1 = StrOption(name="my_var1", doc="my_var1", default=Calculation(func.calc_val, Params((ParamOption(option_2)))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_1 = StrOption(name="my_var1", doc="my_var1", default=Calculation(func.calc_val, Params((ParamOption(option_2)))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01fill_autofreeze/tiramisu/multi.py b/tests/dictionaries/01fill_autofreeze/tiramisu/multi.py index 5cd131ba7..29bc3d2d9 100644 --- a/tests/dictionaries/01fill_autofreeze/tiramisu/multi.py +++ b/tests/dictionaries/01fill_autofreeze/tiramisu/multi.py @@ -20,12 +20,12 @@ except: from tiramisu import * option_2 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal"})) option_3 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_1 = StrOption(name="my_var1", doc="my_var1", default=Calculation(func.calc_val, Params((ParamOption(option_2)))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_1 = StrOption(name="my_var1", doc="my_var1", default=Calculation(func.calc_val, Params((ParamOption(option_2)))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3]) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal"})) option_6 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="my_var1", doc="my_var1", default=Calculation(func.calc_val, Params((ParamOption(option_5)))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_4 = StrOption(name="my_var1", doc="my_var1", default=Calculation(func.calc_val, Params((ParamOption(option_5)))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, option_5, option_6]) optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7, optiondescription_9]) diff --git a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py index 552ab1ec7..372fd80ed 100644 --- a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py @@ -19,6 +19,6 @@ try: except: from tiramisu import * option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_2 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_2 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/multi.py b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/multi.py index cf73d70cc..58b3a2504 100644 --- a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/multi.py +++ b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/multi.py @@ -19,11 +19,11 @@ try: except: from tiramisu import * option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_2 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_2 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_3 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_4 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5, optiondescription_7]) diff --git a/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py index 088aef96e..193ba2b00 100644 --- a/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_4 = StrOption(name="autosavevar", doc="autosave variable", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_4 = StrOption(name="autosavevar", doc="autosave variable", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"basic"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/multi.py b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/multi.py index d7162942a..4ea9b0eda 100644 --- a/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/multi.py +++ b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/multi.py @@ -20,13 +20,13 @@ except: from tiramisu import * option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_4 = StrOption(name="autosavevar", doc="autosave variable", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_4 = StrOption(name="autosavevar", doc="autosave variable", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"basic"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_5 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_8 = StrOption(name="autosavevar", doc="autosave variable", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_8 = StrOption(name="autosavevar", doc="autosave variable", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_6 = OptionDescription(name="general", doc="général", children=[option_7, option_8], properties=frozenset({"basic"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_5, optiondescription_6]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10leadership_append/makedict/after.json b/tests/dictionaries/10leadership_append/makedict/after.json index 6dedaf65b..f7be8deb1 100644 --- a/tests/dictionaries/10leadership_append/makedict/after.json +++ b/tests/dictionaries/10leadership_append/makedict/after.json @@ -6,17 +6,5 @@ "rougail.general1.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower2": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower3": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_append/makedict/before.json b/tests/dictionaries/10leadership_append/makedict/before.json index 6dedaf65b..f7be8deb1 100644 --- a/tests/dictionaries/10leadership_append/makedict/before.json +++ b/tests/dictionaries/10leadership_append/makedict/before.json @@ -6,17 +6,5 @@ "rougail.general1.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower2": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower3": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_append_hidden/makedict/after.json b/tests/dictionaries/10leadership_append_hidden/makedict/after.json index 6dedaf65b..f7be8deb1 100644 --- a/tests/dictionaries/10leadership_append_hidden/makedict/after.json +++ b/tests/dictionaries/10leadership_append_hidden/makedict/after.json @@ -6,17 +6,5 @@ "rougail.general1.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower2": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower3": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_append_hidden/makedict/before.json b/tests/dictionaries/10leadership_append_hidden/makedict/before.json index 6dedaf65b..f7be8deb1 100644 --- a/tests/dictionaries/10leadership_append_hidden/makedict/before.json +++ b/tests/dictionaries/10leadership_append_hidden/makedict/before.json @@ -6,17 +6,5 @@ "rougail.general1.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower2": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower3": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_append_name/makedict/after.json b/tests/dictionaries/10leadership_append_name/makedict/after.json index 00346093d..c6fc9aeae 100644 --- a/tests/dictionaries/10leadership_append_name/makedict/after.json +++ b/tests/dictionaries/10leadership_append_name/makedict/after.json @@ -6,17 +6,5 @@ "rougail.general1.leadership.leader": { "owner": "default", "value": [] - }, - "rougail.general1.leadership.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leadership.follower2": { - "owner": [], - "value": [] - }, - "rougail.general1.leadership.follower3": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_append_name/makedict/before.json b/tests/dictionaries/10leadership_append_name/makedict/before.json index 00346093d..c6fc9aeae 100644 --- a/tests/dictionaries/10leadership_append_name/makedict/before.json +++ b/tests/dictionaries/10leadership_append_name/makedict/before.json @@ -6,17 +6,5 @@ "rougail.general1.leadership.leader": { "owner": "default", "value": [] - }, - "rougail.general1.leadership.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leadership.follower2": { - "owner": [], - "value": [] - }, - "rougail.general1.leadership.follower3": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_auto/makedict/after.json b/tests/dictionaries/10leadership_auto/makedict/after.json index 6810558b2..548ec3acc 100644 --- a/tests/dictionaries/10leadership_auto/makedict/after.json +++ b/tests/dictionaries/10leadership_auto/makedict/after.json @@ -6,17 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower3": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_auto/makedict/before.json b/tests/dictionaries/10leadership_auto/makedict/before.json index 6810558b2..548ec3acc 100644 --- a/tests/dictionaries/10leadership_auto/makedict/before.json +++ b/tests/dictionaries/10leadership_auto/makedict/before.json @@ -6,17 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower3": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_autoleader/makedict/after.json b/tests/dictionaries/10leadership_autoleader/makedict/after.json index dd62b9801..548ec3acc 100644 --- a/tests/dictionaries/10leadership_autoleader/makedict/after.json +++ b/tests/dictionaries/10leadership_autoleader/makedict/after.json @@ -6,13 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_autoleader/makedict/before.json b/tests/dictionaries/10leadership_autoleader/makedict/before.json index dd62b9801..548ec3acc 100644 --- a/tests/dictionaries/10leadership_autoleader/makedict/before.json +++ b/tests/dictionaries/10leadership_autoleader/makedict/before.json @@ -6,13 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_autoleader_expert/makedict/after.json b/tests/dictionaries/10leadership_autoleader_expert/makedict/after.json index 34eba3d58..a06c87b44 100644 --- a/tests/dictionaries/10leadership_autoleader_expert/makedict/after.json +++ b/tests/dictionaries/10leadership_autoleader_expert/makedict/after.json @@ -6,13 +6,5 @@ "rougail.leadermode.leader.leader": { "owner": "default", "value": [] - }, - "rougail.leadermode.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.leadermode.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_autoleader_expert/makedict/before.json b/tests/dictionaries/10leadership_autoleader_expert/makedict/before.json index 34eba3d58..a06c87b44 100644 --- a/tests/dictionaries/10leadership_autoleader_expert/makedict/before.json +++ b/tests/dictionaries/10leadership_autoleader_expert/makedict/before.json @@ -6,13 +6,5 @@ "rougail.leadermode.leader.leader": { "owner": "default", "value": [] - }, - "rougail.leadermode.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.leadermode.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_autosaveexpert/makedict/after.json b/tests/dictionaries/10leadership_autosaveexpert/makedict/after.json index dd62b9801..548ec3acc 100644 --- a/tests/dictionaries/10leadership_autosaveexpert/makedict/after.json +++ b/tests/dictionaries/10leadership_autosaveexpert/makedict/after.json @@ -6,13 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_autosaveexpert/makedict/before.json b/tests/dictionaries/10leadership_autosaveexpert/makedict/before.json index dd62b9801..548ec3acc 100644 --- a/tests/dictionaries/10leadership_autosaveexpert/makedict/before.json +++ b/tests/dictionaries/10leadership_autosaveexpert/makedict/before.json @@ -6,13 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_leader_hidden/makedict/after.json b/tests/dictionaries/10leadership_leader_hidden/makedict/after.json index 34eba3d58..a06c87b44 100644 --- a/tests/dictionaries/10leadership_leader_hidden/makedict/after.json +++ b/tests/dictionaries/10leadership_leader_hidden/makedict/after.json @@ -6,13 +6,5 @@ "rougail.leadermode.leader.leader": { "owner": "default", "value": [] - }, - "rougail.leadermode.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.leadermode.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_leader_hidden/makedict/before.json b/tests/dictionaries/10leadership_leader_hidden/makedict/before.json index 34eba3d58..a06c87b44 100644 --- a/tests/dictionaries/10leadership_leader_hidden/makedict/before.json +++ b/tests/dictionaries/10leadership_leader_hidden/makedict/before.json @@ -6,13 +6,5 @@ "rougail.leadermode.leader.leader": { "owner": "default", "value": [] - }, - "rougail.leadermode.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.leadermode.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/makedict/after.json b/tests/dictionaries/10leadership_leader_hidden_if_in/makedict/after.json index 34eba3d58..a06c87b44 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in/makedict/after.json +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/makedict/after.json @@ -6,13 +6,5 @@ "rougail.leadermode.leader.leader": { "owner": "default", "value": [] - }, - "rougail.leadermode.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.leadermode.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/makedict/before.json b/tests/dictionaries/10leadership_leader_hidden_if_in/makedict/before.json index 34eba3d58..a06c87b44 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in/makedict/before.json +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/makedict/before.json @@ -6,13 +6,5 @@ "rougail.leadermode.leader.leader": { "owner": "default", "value": [] - }, - "rougail.leadermode.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.leadermode.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py index b1034ffd4..b07bcac96 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py @@ -20,10 +20,10 @@ except: from tiramisu import * option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"expert"})) -option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) optiondescription_3 = OptionDescription(name="leadermode", doc="leadermode", children=[optiondescription_4], properties=frozenset({"normal"})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8]) diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/multi.py b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/multi.py index 287631315..355f69c34 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/multi.py @@ -20,19 +20,19 @@ except: from tiramisu import * option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"expert"})) -option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) optiondescription_3 = OptionDescription(name="leadermode", doc="leadermode", children=[optiondescription_4], properties=frozenset({"normal"})) optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16]) option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_8 = OptionDescription(name="general", doc="general", children=[option_9], properties=frozenset({"expert"})) -option_12 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -option_13 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -option_14 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -optiondescription_11 = Leadership(name="leader", doc="leader", children=[option_12, option_13, option_14], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) +option_12 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +option_13 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +option_14 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +optiondescription_11 = Leadership(name="leader", doc="leader", children=[option_12, option_13, option_14], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) optiondescription_10 = OptionDescription(name="leadermode", doc="leadermode", children=[optiondescription_11], properties=frozenset({"normal"})) optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10]) optiondescription_17 = OptionDescription(name="2", doc="2", children=[optiondescription_18]) diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/makedict/after.json b/tests/dictionaries/10leadership_leader_hidden_if_in_name/makedict/after.json index 05ecdcd29..8b4b57426 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in_name/makedict/after.json +++ b/tests/dictionaries/10leadership_leader_hidden_if_in_name/makedict/after.json @@ -6,13 +6,5 @@ "rougail.leadermode.other.leader": { "owner": "default", "value": [] - }, - "rougail.leadermode.other.follower1": { - "owner": [], - "value": [] - }, - "rougail.leadermode.other.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/makedict/before.json b/tests/dictionaries/10leadership_leader_hidden_if_in_name/makedict/before.json index 05ecdcd29..8b4b57426 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in_name/makedict/before.json +++ b/tests/dictionaries/10leadership_leader_hidden_if_in_name/makedict/before.json @@ -6,13 +6,5 @@ "rougail.leadermode.other.leader": { "owner": "default", "value": [] - }, - "rougail.leadermode.other.follower1": { - "owner": [], - "value": [] - }, - "rougail.leadermode.other.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py index 1b2d88394..fefa512be 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py @@ -20,10 +20,10 @@ except: from tiramisu import * option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"expert"})) -option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -optiondescription_4 = Leadership(name="other", doc="other", children=[option_5, option_6, option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +optiondescription_4 = Leadership(name="other", doc="other", children=[option_5, option_6, option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) optiondescription_3 = OptionDescription(name="leadermode", doc="leadermode", children=[optiondescription_4], properties=frozenset({"normal"})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8]) diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/multi.py b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/multi.py index e79a1de89..1aac50b28 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/multi.py @@ -20,19 +20,19 @@ except: from tiramisu import * option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"expert"})) -option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -optiondescription_4 = Leadership(name="other", doc="other", children=[option_5, option_6, option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +optiondescription_4 = Leadership(name="other", doc="other", children=[option_5, option_6, option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) optiondescription_3 = OptionDescription(name="leadermode", doc="leadermode", children=[optiondescription_4], properties=frozenset({"normal"})) optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16]) option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_8 = OptionDescription(name="general", doc="general", children=[option_9], properties=frozenset({"expert"})) -option_12 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -option_13 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -option_14 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -optiondescription_11 = Leadership(name="other", doc="other", children=[option_12, option_13, option_14], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) +option_12 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +option_13 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +option_14 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +optiondescription_11 = Leadership(name="other", doc="other", children=[option_12, option_13, option_14], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) optiondescription_10 = OptionDescription(name="leadermode", doc="leadermode", children=[optiondescription_11], properties=frozenset({"normal"})) optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10]) optiondescription_17 = OptionDescription(name="2", doc="2", children=[optiondescription_18]) diff --git a/tests/dictionaries/10leadership_leadermandatory/makedict/after.json b/tests/dictionaries/10leadership_leadermandatory/makedict/after.json index dd62b9801..548ec3acc 100644 --- a/tests/dictionaries/10leadership_leadermandatory/makedict/after.json +++ b/tests/dictionaries/10leadership_leadermandatory/makedict/after.json @@ -6,13 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_leadermandatory/makedict/before.json b/tests/dictionaries/10leadership_leadermandatory/makedict/before.json index dd62b9801..548ec3acc 100644 --- a/tests/dictionaries/10leadership_leadermandatory/makedict/before.json +++ b/tests/dictionaries/10leadership_leadermandatory/makedict/before.json @@ -6,13 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_mandatory/makedict/after.json b/tests/dictionaries/10leadership_mandatory/makedict/after.json index dd62b9801..548ec3acc 100644 --- a/tests/dictionaries/10leadership_mandatory/makedict/after.json +++ b/tests/dictionaries/10leadership_mandatory/makedict/after.json @@ -6,13 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_mandatory/makedict/before.json b/tests/dictionaries/10leadership_mandatory/makedict/before.json index dd62b9801..548ec3acc 100644 --- a/tests/dictionaries/10leadership_mandatory/makedict/before.json +++ b/tests/dictionaries/10leadership_mandatory/makedict/before.json @@ -6,13 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_mandatoryfollower/makedict/after.json b/tests/dictionaries/10leadership_mandatoryfollower/makedict/after.json index c66326dac..df73b8790 100644 --- a/tests/dictionaries/10leadership_mandatoryfollower/makedict/after.json +++ b/tests/dictionaries/10leadership_mandatoryfollower/makedict/after.json @@ -6,9 +6,5 @@ "rougail.general.nut_monitor_netmask.nut_monitor_netmask": { "owner": "default", "value": [] - }, - "rougail.general.nut_monitor_netmask.nut_monitor_host": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_mandatoryfollower/makedict/before.json b/tests/dictionaries/10leadership_mandatoryfollower/makedict/before.json index c66326dac..df73b8790 100644 --- a/tests/dictionaries/10leadership_mandatoryfollower/makedict/before.json +++ b/tests/dictionaries/10leadership_mandatoryfollower/makedict/before.json @@ -6,9 +6,5 @@ "rougail.general.nut_monitor_netmask.nut_monitor_netmask": { "owner": "default", "value": [] - }, - "rougail.general.nut_monitor_netmask.nut_monitor_host": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_mandatoryfollower_value/makedict/after.json b/tests/dictionaries/10leadership_mandatoryfollower_value/makedict/after.json index c66326dac..df73b8790 100644 --- a/tests/dictionaries/10leadership_mandatoryfollower_value/makedict/after.json +++ b/tests/dictionaries/10leadership_mandatoryfollower_value/makedict/after.json @@ -6,9 +6,5 @@ "rougail.general.nut_monitor_netmask.nut_monitor_netmask": { "owner": "default", "value": [] - }, - "rougail.general.nut_monitor_netmask.nut_monitor_host": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_mandatoryfollower_value/makedict/before.json b/tests/dictionaries/10leadership_mandatoryfollower_value/makedict/before.json index c66326dac..df73b8790 100644 --- a/tests/dictionaries/10leadership_mandatoryfollower_value/makedict/before.json +++ b/tests/dictionaries/10leadership_mandatoryfollower_value/makedict/before.json @@ -6,9 +6,5 @@ "rougail.general.nut_monitor_netmask.nut_monitor_netmask": { "owner": "default", "value": [] - }, - "rougail.general.nut_monitor_netmask.nut_monitor_host": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_multi/makedict/after.json b/tests/dictionaries/10leadership_multi/makedict/after.json index 84e0751ce..0b42b7958 100644 --- a/tests/dictionaries/10leadership_multi/makedict/after.json +++ b/tests/dictionaries/10leadership_multi/makedict/after.json @@ -7,24 +7,8 @@ "owner": "default", "value": [] }, - "rougail.general1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower2": { - "owner": [], - "value": [] - }, "rougail.general1.leader1.leader1": { "owner": "default", "value": [] - }, - "rougail.general1.leader1.follower11": { - "owner": [], - "value": [] - }, - "rougail.general1.leader1.follower21": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10leadership_multi/makedict/before.json b/tests/dictionaries/10leadership_multi/makedict/before.json index 84e0751ce..0b42b7958 100644 --- a/tests/dictionaries/10leadership_multi/makedict/before.json +++ b/tests/dictionaries/10leadership_multi/makedict/before.json @@ -7,24 +7,8 @@ "owner": "default", "value": [] }, - "rougail.general1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower2": { - "owner": [], - "value": [] - }, "rougail.general1.leader1.leader1": { "owner": "default", "value": [] - }, - "rougail.general1.leader1.follower11": { - "owner": [], - "value": [] - }, - "rougail.general1.leader1.follower21": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py index 829c42453..410fcc1e6 100644 --- a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_disabled_if_in/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in/tiramisu/multi.py index 6ce354ca6..52fcf1903 100644 --- a/tests/dictionaries/10load_disabled_if_in/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in/tiramisu/multi.py @@ -19,14 +19,14 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/base.py index 3e29eafa4..ccb21664f 100644 --- a/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/base.py @@ -19,7 +19,7 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="variable1", doc="variable1", properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))})) +option_3 = StrOption(name="variable1", doc="variable1", properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) option_4 = StrOption(name="variable2", doc="variable2", default=Calculation(func.calc_val, Params((ParamOption(option_3, notraisepropertyerror=True)))), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) diff --git a/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/multi.py index 14c0fdf05..2d2d8a56f 100644 --- a/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/multi.py @@ -19,13 +19,13 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="variable1", doc="variable1", properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))})) +option_3 = StrOption(name="variable1", doc="variable1", properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) option_4 = StrOption(name="variable2", doc="variable2", default=Calculation(func.calc_val, Params((ParamOption(option_3, notraisepropertyerror=True)))), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="variable1", doc="variable1", properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))})) +option_7 = StrOption(name="variable1", doc="variable1", properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) option_8 = StrOption(name="variable2", doc="variable2", default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=True)))), properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py index a9d2c6705..d98603086 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/multi.py index e26ed3ead..7a3d19d29 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/multi.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") @@ -35,8 +35,8 @@ optiondescription_26.impl_set_information('type', "service") optiondescription_25 = OptionDescription(name="services", doc="services", children=[optiondescription_26], properties=frozenset({"hidden"})) optiondescription_23 = OptionDescription(name="1", doc="1", children=[optiondescription_24, optiondescription_25]) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py index 03ed87b78..44102f56f 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/multi.py index a2440eadc..76f375d00 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/multi.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") @@ -36,7 +36,7 @@ optiondescription_25 = OptionDescription(name="services", doc="services", childr optiondescription_23 = OptionDescription(name="1", doc="1", children=[optiondescription_24, optiondescription_25]) option_6 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) -option_8 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_8 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py index a881687b8..debd2ed3e 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/multi.py index 16501f4eb..d1fd319a6 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/multi.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") @@ -36,7 +36,7 @@ optiondescription_25 = OptionDescription(name="services", doc="services", childr optiondescription_23 = OptionDescription(name="1", doc="1", children=[optiondescription_24, optiondescription_25]) option_6 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) -option_8 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_8 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py index 51c0da04c..9c74bd757 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/multi.py index 15078d656..fc12d181b 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/multi.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") @@ -36,7 +36,7 @@ optiondescription_25 = OptionDescription(name="services", doc="services", childr optiondescription_23 = OptionDescription(name="1", doc="1", children=[optiondescription_24, optiondescription_25]) option_6 = StrOption(name="condition", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) -option_8 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_8 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py index d833341fe..bea494804 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition2", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/multi.py index e498289a1..c67bcd637 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/multi.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition2", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") @@ -36,7 +36,7 @@ optiondescription_25 = OptionDescription(name="services", doc="services", childr optiondescription_23 = OptionDescription(name="1", doc="1", children=[optiondescription_24, optiondescription_25]) option_6 = StrOption(name="condition", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="condition2", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"})) -option_8 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_8 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py index c1ff43ffe..d095ce001 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition2", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/multi.py index bb5809db9..b2f9fdc4e 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/multi.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition2", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_4 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") @@ -36,7 +36,7 @@ optiondescription_25 = OptionDescription(name="services", doc="services", childr optiondescription_23 = OptionDescription(name="1", doc="1", children=[optiondescription_24, optiondescription_25]) option_6 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="condition2", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"})) -option_8 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_8 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py index 5df980266..8a0122055 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/multi.py index 927561656..4cefbe4be 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/multi.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") @@ -35,8 +35,8 @@ optiondescription_26.impl_set_information('type', "service") optiondescription_25 = OptionDescription(name="services", doc="services", children=[optiondescription_26], properties=frozenset({"hidden"})) optiondescription_23 = OptionDescription(name="1", doc="1", children=[optiondescription_24, optiondescription_25]) option_6 = StrOption(name="condition", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("maybe")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py index 08cd641a8..3d72d9e53 100644 --- a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(None)}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(None)}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(None)}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(None)}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/multi.py index 6981b6a2b..a6240bcab 100644 --- a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/multi.py @@ -19,14 +19,14 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(None)}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(None)}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(None)}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(None)}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue(None)}))})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue(None)}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue(None)}), func.calc_value_property_help)})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue(None)}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/base.py index 5b7fec7c3..92cb4d3a5 100644 --- a/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/base.py @@ -19,7 +19,7 @@ try: except: from tiramisu import * option_1 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"mandatory", "normal"})) -option_2 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))})) -option_3 = StrOption(name="my_var3", doc="my_var3", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))})) +option_2 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) +option_3 = StrOption(name="my_var3", doc="my_var3", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/multi.py index 1d79e8a75..3654d0b8a 100644 --- a/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/multi.py @@ -19,13 +19,13 @@ try: except: from tiramisu import * option_1 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"mandatory", "normal"})) -option_2 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))})) -option_3 = StrOption(name="my_var3", doc="my_var3", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))})) +option_2 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) +option_3 = StrOption(name="my_var3", doc="my_var3", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3]) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_4 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"mandatory", "normal"})) -option_5 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))})) -option_6 = StrOption(name="my_var3", doc="my_var3", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))})) +option_5 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) +option_6 = StrOption(name="my_var3", doc="my_var3", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, option_5, option_6]) optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7, optiondescription_9]) diff --git a/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/base.py index 27f50dfd7..a72e1206b 100644 --- a/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/base.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="tous", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_3)}))})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamOption(option_3)}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/multi.py index 12b1afb2f..4f87ca331 100644 --- a/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/multi.py @@ -20,13 +20,13 @@ except: from tiramisu import * option_2 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="tous", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_3)}))})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamOption(option_3)}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="tous", properties=frozenset({"mandatory", "normal"})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_7)}))})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamOption(option_7)}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/base.py index 0fecb15ec..085ace1c9 100644 --- a/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/base.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="aucun", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_3)}))})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamOption(option_3)}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/multi.py index d0180dbda..d540c2521 100644 --- a/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/multi.py @@ -20,13 +20,13 @@ except: from tiramisu import * option_2 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="aucun", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_3)}))})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamOption(option_3)}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="aucun", properties=frozenset({"mandatory", "normal"})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_7)}))})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamOption(option_7)}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py index 963178ea4..2aef8a983 100644 --- a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/multi.py b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/multi.py index 7d2aae172..26952126c 100644 --- a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/multi.py @@ -20,13 +20,13 @@ except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py index 7ad718fad..ea2c23194 100644 --- a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/multi.py b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/multi.py index 38b01ba51..1cad3e267 100644 --- a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/multi.py @@ -19,14 +19,14 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py index 7ad718fad..ea2c23194 100644 --- a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/multi.py b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/multi.py index 38b01ba51..1cad3e267 100644 --- a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/multi.py @@ -19,14 +19,14 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10load_frozenifin/tiramisu/base.py b/tests/dictionaries/10load_frozenifin/tiramisu/base.py index ae38f0d23..976f331bd 100644 --- a/tests/dictionaries/10load_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_frozenifin/tiramisu/multi.py b/tests/dictionaries/10load_frozenifin/tiramisu/multi.py index df89eb2e9..7f016f63d 100644 --- a/tests/dictionaries/10load_frozenifin/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifin/tiramisu/multi.py @@ -19,14 +19,14 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py index ab8bac3fc..0254be54a 100644 --- a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("non")))), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("non")))), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_frozenifin_auto/tiramisu/multi.py b/tests/dictionaries/10load_frozenifin_auto/tiramisu/multi.py index 52c1ac144..e233eeab4 100644 --- a/tests/dictionaries/10load_frozenifin_auto/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifin_auto/tiramisu/multi.py @@ -19,14 +19,14 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("non")))), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("non")))), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("non")))), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("non")))), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py index 5b71fc750..2f1275ee0 100644 --- a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/multi.py b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/multi.py index 7300b5526..339360931 100644 --- a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/multi.py @@ -19,14 +19,14 @@ try: except: from tiramisu import * option_2 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}))})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help)})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("tous")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py index 5ae602c1d..05a0da93d 100644 --- a/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="tous", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_3)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_3)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_3)}))})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamOption(option_3)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamOption(option_3)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamOption(option_3)}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_frozenifin_variable/tiramisu/multi.py b/tests/dictionaries/10load_frozenifin_variable/tiramisu/multi.py index 3e2a794aa..6b89d302c 100644 --- a/tests/dictionaries/10load_frozenifin_variable/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifin_variable/tiramisu/multi.py @@ -20,13 +20,13 @@ except: from tiramisu import * option_2 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="tous", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_3)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_3)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_3)}))})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamOption(option_3)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamOption(option_3)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamOption(option_3)}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="tous", properties=frozenset({"mandatory", "normal"})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_7)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_7)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_7)}))})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamOption(option_7)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamOption(option_7)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamOption(option_7)}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py b/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py index 1cd8a65fb..5fbda34fd 100644 --- a/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_frozenifnotin/tiramisu/multi.py b/tests/dictionaries/10load_frozenifnotin/tiramisu/multi.py index f393daee4..5fe84acf3 100644 --- a/tests/dictionaries/10load_frozenifnotin/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifnotin/tiramisu/multi.py @@ -19,14 +19,14 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help)})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py index a761cdd8a..afd99fa7c 100644 --- a/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="Général", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/multi.py b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/multi.py index 0973bc22b..c3008c6dd 100644 --- a/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/multi.py +++ b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/multi.py @@ -19,14 +19,14 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="Général", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_7 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_8 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_9 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_8 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_9 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_6 = OptionDescription(name="general", doc="Général", children=[option_7, option_8, option_9], properties=frozenset({"normal"})) optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6]) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) diff --git a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py index f8d8ee2f6..26d9dac48 100644 --- a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py @@ -19,10 +19,10 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="Général", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) -option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -optiondescription_5 = OptionDescription(name="general2", doc="Général2", children=[option_6], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +optiondescription_5 = OptionDescription(name="general2", doc="Général2", children=[option_6], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_5]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/10load_hidden_if_family/tiramisu/multi.py b/tests/dictionaries/10load_hidden_if_family/tiramisu/multi.py index 78e21a04d..d60cd465a 100644 --- a/tests/dictionaries/10load_hidden_if_family/tiramisu/multi.py +++ b/tests/dictionaries/10load_hidden_if_family/tiramisu/multi.py @@ -19,19 +19,19 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="Général", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) -option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -optiondescription_5 = OptionDescription(name="general2", doc="Général2", children=[option_6], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +optiondescription_5 = OptionDescription(name="general2", doc="Général2", children=[option_6], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_5]) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) option_8 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_10 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_10 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_7 = OptionDescription(name="general", doc="Général", children=[option_8, option_9, option_10], properties=frozenset({"normal"})) -option_12 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -optiondescription_11 = OptionDescription(name="general2", doc="Général2", children=[option_12], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_12 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +optiondescription_11 = OptionDescription(name="general2", doc="Général2", children=[option_12], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7, optiondescription_11]) optiondescription_15 = OptionDescription(name="2", doc="2", children=[optiondescription_16]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_13, optiondescription_15]) diff --git a/tests/dictionaries/10load_leadership/makedict/after.json b/tests/dictionaries/10load_leadership/makedict/after.json index f77abfc09..f7be8deb1 100644 --- a/tests/dictionaries/10load_leadership/makedict/after.json +++ b/tests/dictionaries/10load_leadership/makedict/after.json @@ -6,13 +6,5 @@ "rougail.general1.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10load_leadership/makedict/before.json b/tests/dictionaries/10load_leadership/makedict/before.json index f77abfc09..f7be8deb1 100644 --- a/tests/dictionaries/10load_leadership/makedict/before.json +++ b/tests/dictionaries/10load_leadership/makedict/before.json @@ -6,13 +6,5 @@ "rougail.general1.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10load_leadership_default_multi/makedict/after.json b/tests/dictionaries/10load_leadership_default_multi/makedict/after.json index bb1ba6d4a..613679936 100644 --- a/tests/dictionaries/10load_leadership_default_multi/makedict/after.json +++ b/tests/dictionaries/10load_leadership_default_multi/makedict/after.json @@ -8,13 +8,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10load_leadership_default_multi/makedict/before.json b/tests/dictionaries/10load_leadership_default_multi/makedict/before.json index bb1ba6d4a..613679936 100644 --- a/tests/dictionaries/10load_leadership_default_multi/makedict/before.json +++ b/tests/dictionaries/10load_leadership_default_multi/makedict/before.json @@ -8,13 +8,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10load_leadership_description/makedict/after.json b/tests/dictionaries/10load_leadership_description/makedict/after.json index f77abfc09..f7be8deb1 100644 --- a/tests/dictionaries/10load_leadership_description/makedict/after.json +++ b/tests/dictionaries/10load_leadership_description/makedict/after.json @@ -6,13 +6,5 @@ "rougail.general1.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10load_leadership_description/makedict/before.json b/tests/dictionaries/10load_leadership_description/makedict/before.json index f77abfc09..f7be8deb1 100644 --- a/tests/dictionaries/10load_leadership_description/makedict/before.json +++ b/tests/dictionaries/10load_leadership_description/makedict/before.json @@ -6,13 +6,5 @@ "rougail.general1.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10load_leadership_name/makedict/after.json b/tests/dictionaries/10load_leadership_name/makedict/after.json index c38c753a1..9a3e9d32a 100644 --- a/tests/dictionaries/10load_leadership_name/makedict/after.json +++ b/tests/dictionaries/10load_leadership_name/makedict/after.json @@ -6,13 +6,5 @@ "rougail.general1.other_name.leader": { "owner": "default", "value": [] - }, - "rougail.general1.other_name.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.other_name.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10load_leadership_name/makedict/before.json b/tests/dictionaries/10load_leadership_name/makedict/before.json index c38c753a1..9a3e9d32a 100644 --- a/tests/dictionaries/10load_leadership_name/makedict/before.json +++ b/tests/dictionaries/10load_leadership_name/makedict/before.json @@ -6,13 +6,5 @@ "rougail.general1.other_name.leader": { "owner": "default", "value": [] - }, - "rougail.general1.other_name.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.other_name.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10load_leadership_submulti/makedict/after.json b/tests/dictionaries/10load_leadership_submulti/makedict/after.json index f77abfc09..f7be8deb1 100644 --- a/tests/dictionaries/10load_leadership_submulti/makedict/after.json +++ b/tests/dictionaries/10load_leadership_submulti/makedict/after.json @@ -6,13 +6,5 @@ "rougail.general1.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10load_leadership_submulti/makedict/before.json b/tests/dictionaries/10load_leadership_submulti/makedict/before.json index f77abfc09..f7be8deb1 100644 --- a/tests/dictionaries/10load_leadership_submulti/makedict/before.json +++ b/tests/dictionaries/10load_leadership_submulti/makedict/before.json @@ -6,13 +6,5 @@ "rougail.general1.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general1.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py index 578dd2cb5..198282533 100644 --- a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py +++ b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_mandatoryifin/tiramisu/multi.py b/tests/dictionaries/10load_mandatoryifin/tiramisu/multi.py index 9f3c15f09..d9e8b0f16 100644 --- a/tests/dictionaries/10load_mandatoryifin/tiramisu/multi.py +++ b/tests/dictionaries/10load_mandatoryifin/tiramisu/multi.py @@ -19,14 +19,14 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/10valid_enum_leader/makedict/after.json b/tests/dictionaries/10valid_enum_leader/makedict/after.json index dd62b9801..548ec3acc 100644 --- a/tests/dictionaries/10valid_enum_leader/makedict/after.json +++ b/tests/dictionaries/10valid_enum_leader/makedict/after.json @@ -6,13 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/10valid_enum_leader/makedict/before.json b/tests/dictionaries/10valid_enum_leader/makedict/before.json index dd62b9801..548ec3acc 100644 --- a/tests/dictionaries/10valid_enum_leader/makedict/before.json +++ b/tests/dictionaries/10valid_enum_leader/makedict/before.json @@ -6,13 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py index 82e131f21..4d3abe6ba 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") diff --git a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/multi.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/multi.py index 8d5a536c3..c89bb0ed9 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/multi.py +++ b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/multi.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_13 = FilenameOption(name="name", doc="name", default="/etc/file") @@ -35,8 +35,8 @@ optiondescription_26.impl_set_information('type', "service") optiondescription_25 = OptionDescription(name="services", doc="services", children=[optiondescription_26], properties=frozenset({"hidden"})) optiondescription_23 = OptionDescription(name="1", doc="1", children=[optiondescription_24, optiondescription_25]) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_8 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_8 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) option_20 = FilenameOption(name="name", doc="name", default="/etc/file") diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py index c9a0c7b82..3b0fd8ff7 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/multi.py b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/multi.py index f086660ed..0aaa4f6fd 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/multi.py +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/multi.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_13 = FilenameOption(name="name", doc="name", default="/etc/file") @@ -35,8 +35,8 @@ optiondescription_26.impl_set_information('type', "service") optiondescription_25 = OptionDescription(name="services", doc="services", children=[optiondescription_26], properties=frozenset({"hidden"})) optiondescription_23 = OptionDescription(name="1", doc="1", children=[optiondescription_24, optiondescription_25]) option_6 = StrOption(name="condition", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) option_20 = FilenameOption(name="name", doc="name", default="/etc/file") diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py index 03a3c8f4c..942bba723 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/multi.py b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/multi.py index 9b878d433..70955a50c 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/multi.py +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/multi.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") @@ -39,8 +39,8 @@ optiondescription_34.impl_set_information('type', "service") optiondescription_33 = OptionDescription(name="services", doc="services", children=[optiondescription_34], properties=frozenset({"hidden"})) optiondescription_31 = OptionDescription(name="1", doc="1", children=[optiondescription_32, optiondescription_33]) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) option_24 = FilenameOption(name="name", doc="name", default="/tmp/file1") diff --git a/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/base.py index 82e131f21..4d3abe6ba 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/base.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") diff --git a/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/multi.py b/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/multi.py index 8d5a536c3..c89bb0ed9 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/multi.py +++ b/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/multi.py @@ -19,8 +19,8 @@ try: except: from tiramisu import * option_2 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_4 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_4 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_13 = FilenameOption(name="name", doc="name", default="/etc/file") @@ -35,8 +35,8 @@ optiondescription_26.impl_set_information('type', "service") optiondescription_25 = OptionDescription(name="services", doc="services", children=[optiondescription_26], properties=frozenset({"hidden"})) optiondescription_23 = OptionDescription(name="1", doc="1", children=[optiondescription_24, optiondescription_25]) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_8 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_8 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) option_20 = FilenameOption(name="name", doc="name", default="/etc/file") diff --git a/tests/dictionaries/20family_disabled/makedict/after.json b/tests/dictionaries/20family_disabled/makedict/after.json index 2c63c0851..0967ef424 100644 --- a/tests/dictionaries/20family_disabled/makedict/after.json +++ b/tests/dictionaries/20family_disabled/makedict/after.json @@ -1,2 +1 @@ -{ -} +{} diff --git a/tests/dictionaries/20family_disabled/makedict/base.json b/tests/dictionaries/20family_disabled/makedict/base.json index 2c63c0851..0967ef424 100644 --- a/tests/dictionaries/20family_disabled/makedict/base.json +++ b/tests/dictionaries/20family_disabled/makedict/base.json @@ -1,2 +1 @@ -{ -} +{} diff --git a/tests/dictionaries/20family_disabled/makedict/before.json b/tests/dictionaries/20family_disabled/makedict/before.json index 2c63c0851..0967ef424 100644 --- a/tests/dictionaries/20family_disabled/makedict/before.json +++ b/tests/dictionaries/20family_disabled/makedict/before.json @@ -1,2 +1 @@ -{ -} +{} diff --git a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py index 2fab5fa58..5678f3481 100644 --- a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py @@ -22,8 +22,8 @@ from rougail.tiramisu import ConvertDynOptionDescription option_2 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) option_6 = StrOption(name="newvar", doc="No change", properties=frozenset({"normal"})) -option_4 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) +option_4 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="new", doc="new", children=[option_6], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3, optiondescription_5]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/20family_dynamic_calc2/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_calc2/tiramisu/multi.py index 1f3727281..7644e5f2a 100644 --- a/tests/dictionaries/20family_dynamic_calc2/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_calc2/tiramisu/multi.py @@ -22,16 +22,16 @@ from rougail.tiramisu import ConvertDynOptionDescription option_2 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) option_6 = StrOption(name="newvar", doc="No change", properties=frozenset({"normal"})) -option_4 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) +option_4 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="new", doc="new", children=[option_6], properties=frozenset({"normal"})) optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3, optiondescription_5]) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) option_8 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) optiondescription_7 = OptionDescription(name="general", doc="general", children=[option_8], properties=frozenset({"normal"})) option_12 = StrOption(name="newvar", doc="No change", properties=frozenset({"normal"})) -option_10 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_12, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_12, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -optiondescription_9 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_8, notraisepropertyerror=True)))), children=[option_10], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_12, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) +option_10 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_12, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_12, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) +optiondescription_9 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_8, notraisepropertyerror=True)))), children=[option_10], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_12, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) optiondescription_11 = OptionDescription(name="new", doc="new", children=[option_12], properties=frozenset({"normal"})) optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7, optiondescription_9, optiondescription_11]) optiondescription_15 = OptionDescription(name="2", doc="2", children=[optiondescription_16]) diff --git a/tests/dictionaries/20family_dynamic_leadership/makedict/after.json b/tests/dictionaries/20family_dynamic_leadership/makedict/after.json index 12eb7e6a6..4fc291d5b 100644 --- a/tests/dictionaries/20family_dynamic_leadership/makedict/after.json +++ b/tests/dictionaries/20family_dynamic_leadership/makedict/after.json @@ -14,14 +14,6 @@ "owner": "default", "value": [] }, - "rougail.dynval1.leadershipval1.follower1val1": { - "owner": [], - "value": [] - }, - "rougail.dynval1.leadershipval1.follower2val1": { - "owner": [], - "value": [] - }, "rougail.dynval2.vardynval2": { "owner": "default", "value": null @@ -29,13 +21,5 @@ "rougail.dynval2.leadershipval2.leaderval2": { "owner": "default", "value": [] - }, - "rougail.dynval2.leadershipval2.follower1val2": { - "owner": [], - "value": [] - }, - "rougail.dynval2.leadershipval2.follower2val2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/20family_dynamic_leadership/makedict/before.json b/tests/dictionaries/20family_dynamic_leadership/makedict/before.json index 12eb7e6a6..4fc291d5b 100644 --- a/tests/dictionaries/20family_dynamic_leadership/makedict/before.json +++ b/tests/dictionaries/20family_dynamic_leadership/makedict/before.json @@ -14,14 +14,6 @@ "owner": "default", "value": [] }, - "rougail.dynval1.leadershipval1.follower1val1": { - "owner": [], - "value": [] - }, - "rougail.dynval1.leadershipval1.follower2val1": { - "owner": [], - "value": [] - }, "rougail.dynval2.vardynval2": { "owner": "default", "value": null @@ -29,13 +21,5 @@ "rougail.dynval2.leadershipval2.leaderval2": { "owner": "default", "value": [] - }, - "rougail.dynval2.leadershipval2.follower1val2": { - "owner": [], - "value": [] - }, - "rougail.dynval2.leadershipval2.follower2val2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/20family_modeleadership/makedict/after.json b/tests/dictionaries/20family_modeleadership/makedict/after.json index dd62b9801..548ec3acc 100644 --- a/tests/dictionaries/20family_modeleadership/makedict/after.json +++ b/tests/dictionaries/20family_modeleadership/makedict/after.json @@ -6,13 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/20family_modeleadership/makedict/before.json b/tests/dictionaries/20family_modeleadership/makedict/before.json index dd62b9801..548ec3acc 100644 --- a/tests/dictionaries/20family_modeleadership/makedict/before.json +++ b/tests/dictionaries/20family_modeleadership/makedict/before.json @@ -6,13 +6,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/40condition_base/tiramisu/base.py b/tests/dictionaries/40condition_base/tiramisu/base.py index ca5577b6c..e4d0ac12d 100644 --- a/tests/dictionaries/40condition_base/tiramisu/base.py +++ b/tests/dictionaries/40condition_base/tiramisu/base.py @@ -20,8 +20,8 @@ except: from tiramisu import * option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4, option_5], properties=frozenset({"normal"})) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/40condition_base/tiramisu/multi.py b/tests/dictionaries/40condition_base/tiramisu/multi.py index f4880da90..0acf0d0cb 100644 --- a/tests/dictionaries/40condition_base/tiramisu/multi.py +++ b/tests/dictionaries/40condition_base/tiramisu/multi.py @@ -20,15 +20,15 @@ except: from tiramisu import * option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4, option_5], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_8 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_9 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_10 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_9 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_10 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_6 = OptionDescription(name="general", doc="general", children=[option_7, option_8, option_9, option_10], properties=frozenset({"normal"})) optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6]) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) diff --git a/tests/dictionaries/40condition_base_add/tiramisu/base.py b/tests/dictionaries/40condition_base_add/tiramisu/base.py index ca5577b6c..e4d0ac12d 100644 --- a/tests/dictionaries/40condition_base_add/tiramisu/base.py +++ b/tests/dictionaries/40condition_base_add/tiramisu/base.py @@ -20,8 +20,8 @@ except: from tiramisu import * option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4, option_5], properties=frozenset({"normal"})) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/40condition_base_add/tiramisu/multi.py b/tests/dictionaries/40condition_base_add/tiramisu/multi.py index f4880da90..0acf0d0cb 100644 --- a/tests/dictionaries/40condition_base_add/tiramisu/multi.py +++ b/tests/dictionaries/40condition_base_add/tiramisu/multi.py @@ -20,15 +20,15 @@ except: from tiramisu import * option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4, option_5], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_8 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_9 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) -option_10 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_9 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) +option_10 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_6 = OptionDescription(name="general", doc="general", children=[option_7, option_8, option_9, option_10], properties=frozenset({"normal"})) optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6]) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) diff --git a/tests/dictionaries/40condition_optional/tiramisu/base.py b/tests/dictionaries/40condition_optional/tiramisu/base.py index 495fc024d..03d34f259 100644 --- a/tests/dictionaries/40condition_optional/tiramisu/base.py +++ b/tests/dictionaries/40condition_optional/tiramisu/base.py @@ -20,7 +20,7 @@ except: from tiramisu import * option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/40condition_optional/tiramisu/multi.py b/tests/dictionaries/40condition_optional/tiramisu/multi.py index c6142cc11..d20bb867d 100644 --- a/tests/dictionaries/40condition_optional/tiramisu/multi.py +++ b/tests/dictionaries/40condition_optional/tiramisu/multi.py @@ -20,13 +20,13 @@ except: from tiramisu import * option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_8 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_8 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) diff --git a/tests/dictionaries/40condition_optional_family/tiramisu/base.py b/tests/dictionaries/40condition_optional_family/tiramisu/base.py index f91588c47..bb2a304ad 100644 --- a/tests/dictionaries/40condition_optional_family/tiramisu/base.py +++ b/tests/dictionaries/40condition_optional_family/tiramisu/base.py @@ -20,6 +20,6 @@ except: from tiramisu import * option_1 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"})) -optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/40condition_optional_family/tiramisu/multi.py b/tests/dictionaries/40condition_optional_family/tiramisu/multi.py index 798e4a5af..2296d1f7c 100644 --- a/tests/dictionaries/40condition_optional_family/tiramisu/multi.py +++ b/tests/dictionaries/40condition_optional_family/tiramisu/multi.py @@ -20,12 +20,12 @@ except: from tiramisu import * option_1 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"})) -optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_4 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, optiondescription_5]) optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7, optiondescription_9]) diff --git a/tests/dictionaries/40ifin_leadership/makedict/after.json b/tests/dictionaries/40ifin_leadership/makedict/after.json index 1578e3fb9..becfaca7d 100644 --- a/tests/dictionaries/40ifin_leadership/makedict/after.json +++ b/tests/dictionaries/40ifin_leadership/makedict/after.json @@ -10,9 +10,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/40ifin_leadership/makedict/before.json b/tests/dictionaries/40ifin_leadership/makedict/before.json index 1578e3fb9..becfaca7d 100644 --- a/tests/dictionaries/40ifin_leadership/makedict/before.json +++ b/tests/dictionaries/40ifin_leadership/makedict/before.json @@ -10,9 +10,5 @@ "rougail.general.leader.leader": { "owner": "default", "value": [] - }, - "rougail.general.leader.follower2": { - "owner": [], - "value": [] } } diff --git a/tests/dictionaries/40ifin_leadership/tiramisu/base.py b/tests/dictionaries/40ifin_leadership/tiramisu/base.py index 6f84c73e6..303937d04 100644 --- a/tests/dictionaries/40ifin_leadership/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadership/tiramisu/base.py @@ -21,7 +21,7 @@ except: option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="leader", doc="leader", multi=True) -option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, optiondescription_4], properties=frozenset({"normal"})) diff --git a/tests/dictionaries/40ifin_leadership/tiramisu/multi.py b/tests/dictionaries/40ifin_leadership/tiramisu/multi.py index f21bd9afa..92ca7cfa2 100644 --- a/tests/dictionaries/40ifin_leadership/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_leadership/tiramisu/multi.py @@ -21,7 +21,7 @@ except: option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="leader", doc="leader", multi=True) -option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, optiondescription_4], properties=frozenset({"normal"})) @@ -30,7 +30,7 @@ optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondesc option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_10 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"})) option_12 = StrOption(name="leader", doc="leader", multi=True) -option_13 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_10, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_13 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_10, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) option_14 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_11 = Leadership(name="leader", doc="leader", children=[option_12, option_13, option_14], properties=frozenset({"normal"})) optiondescription_8 = OptionDescription(name="general", doc="general", children=[option_9, option_10, optiondescription_11], properties=frozenset({"normal"})) diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py index df276d58d..b859ab72b 100644 --- a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py @@ -21,7 +21,7 @@ except: option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="leader", doc="leader", multi=True, default=['a'], properties=frozenset({"mandatory"})) -option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, optiondescription_4], properties=frozenset({"normal"})) diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/multi.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/multi.py index 69a67f5de..4ad9300ae 100644 --- a/tests/dictionaries/40ifin_leadershipauto/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_leadershipauto/tiramisu/multi.py @@ -21,7 +21,7 @@ except: option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="leader", doc="leader", multi=True, default=['a'], properties=frozenset({"mandatory"})) -option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, optiondescription_4], properties=frozenset({"normal"})) @@ -40,7 +40,7 @@ optiondescription_29 = OptionDescription(name="1", doc="1", children=[optiondesc option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_10 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"})) option_12 = StrOption(name="leader", doc="leader", multi=True, default=['a'], properties=frozenset({"mandatory"})) -option_13 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_10, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_13 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_10, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) option_14 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_11 = Leadership(name="leader", doc="leader", children=[option_12, option_13, option_14], properties=frozenset({"normal"})) optiondescription_8 = OptionDescription(name="general", doc="general", children=[option_9, option_10, optiondescription_11], properties=frozenset({"normal"})) diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/makedict/after.json b/tests/dictionaries/40ifin_leadershipauto_follower/makedict/after.json index 86fb9fb7b..b899df8eb 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/makedict/after.json +++ b/tests/dictionaries/40ifin_leadershipauto_follower/makedict/after.json @@ -20,7 +20,7 @@ "default" ], "value": [ - "cannot access to option \"follower1\" because has property \"disabled\"", + "cannot access to option \"follower1\" because has property \"disabled\" (the value of \"leader\" is \"a\")", null ] }, diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/makedict/before.json b/tests/dictionaries/40ifin_leadershipauto_follower/makedict/before.json index 86fb9fb7b..b899df8eb 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/makedict/before.json +++ b/tests/dictionaries/40ifin_leadershipauto_follower/makedict/before.json @@ -20,7 +20,7 @@ "default" ], "value": [ - "cannot access to option \"follower1\" because has property \"disabled\"", + "cannot access to option \"follower1\" because has property \"disabled\" (the value of \"leader\" is \"a\")", null ] }, diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py index 9d72c4e8f..63b573d13 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py @@ -21,7 +21,7 @@ except: option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b'], properties=frozenset({"mandatory"})) -option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True, notraisepropertyerror=True), 'expected': ParamValue("a")}))})) +option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, notraisepropertyerror=True), 'expected': ParamValue("a")}), func.calc_value_property_help)})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, optiondescription_4], properties=frozenset({"normal"})) diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py index 54befc9a8..58375b98c 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py @@ -21,7 +21,7 @@ except: option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b'], properties=frozenset({"mandatory"})) -option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True, notraisepropertyerror=True), 'expected': ParamValue("a")}))})) +option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, notraisepropertyerror=True), 'expected': ParamValue("a")}), func.calc_value_property_help)})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, optiondescription_4], properties=frozenset({"normal"})) @@ -45,7 +45,7 @@ optiondescription_37 = OptionDescription(name="1", doc="1", children=[optiondesc option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_10 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"})) option_12 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b'], properties=frozenset({"mandatory"})) -option_13 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_12, todict=True, notraisepropertyerror=True), 'expected': ParamValue("a")}))})) +option_13 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_12, notraisepropertyerror=True), 'expected': ParamValue("a")}), func.calc_value_property_help)})) option_14 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_11 = Leadership(name="leader", doc="leader", children=[option_12, option_13, option_14], properties=frozenset({"normal"})) optiondescription_8 = OptionDescription(name="general", doc="general", children=[option_9, option_10, optiondescription_11], properties=frozenset({"normal"})) diff --git a/tests/dictionaries/40ifin_multi/tiramisu/base.py b/tests/dictionaries/40ifin_multi/tiramisu/base.py index b954b356f..c415c4d01 100644 --- a/tests/dictionaries/40ifin_multi/tiramisu/base.py +++ b/tests/dictionaries/40ifin_multi/tiramisu/base.py @@ -21,7 +21,7 @@ except: option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_3 = OptionDescription(name="general2", doc="general2", children=[option_4, option_5], properties=frozenset({"hidden", "normal"})) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/40ifin_multi/tiramisu/multi.py b/tests/dictionaries/40ifin_multi/tiramisu/multi.py index 98af26fc1..a53594348 100644 --- a/tests/dictionaries/40ifin_multi/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_multi/tiramisu/multi.py @@ -21,14 +21,14 @@ except: option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_3 = OptionDescription(name="general2", doc="general2", children=[option_4, option_5], properties=frozenset({"hidden", "normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_6 = OptionDescription(name="general", doc="general", children=[option_7], properties=frozenset({"normal"})) option_9 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_10 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_10 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_8 = OptionDescription(name="general2", doc="general2", children=[option_9, option_10], properties=frozenset({"hidden", "normal"})) optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6, optiondescription_8]) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) diff --git a/tests/dictionaries/40ifin_multi2/tiramisu/base.py b/tests/dictionaries/40ifin_multi2/tiramisu/base.py index d59c1d69b..acb4ac902 100644 --- a/tests/dictionaries/40ifin_multi2/tiramisu/base.py +++ b/tests/dictionaries/40ifin_multi2/tiramisu/base.py @@ -21,7 +21,7 @@ except: option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_3 = OptionDescription(name="general2", doc="general2", children=[option_4, option_5], properties=frozenset({"hidden", "normal"})) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/40ifin_multi2/tiramisu/multi.py b/tests/dictionaries/40ifin_multi2/tiramisu/multi.py index e24a1eb1f..a7ef2db7d 100644 --- a/tests/dictionaries/40ifin_multi2/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_multi2/tiramisu/multi.py @@ -21,14 +21,14 @@ except: option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_3 = OptionDescription(name="general2", doc="general2", children=[option_4, option_5], properties=frozenset({"hidden", "normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_6 = OptionDescription(name="general", doc="general", children=[option_7], properties=frozenset({"normal"})) option_9 = StrOption(name="mode_conteneur_actif2", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_10 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_9, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_10 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_9, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_8 = OptionDescription(name="general2", doc="general2", children=[option_9, option_10], properties=frozenset({"hidden", "normal"})) optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6, optiondescription_8]) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) diff --git a/tests/dictionaries/51redefine_family/tiramisu/base.py b/tests/dictionaries/51redefine_family/tiramisu/base.py index 097b27114..4a151f4ec 100644 --- a/tests/dictionaries/51redefine_family/tiramisu/base.py +++ b/tests/dictionaries/51redefine_family/tiramisu/base.py @@ -21,6 +21,6 @@ except: option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -optiondescription_3 = OptionDescription(name="general2", doc="general2", children=[option_4], properties=frozenset({"hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +optiondescription_3 = OptionDescription(name="general2", doc="general2", children=[option_4], properties=frozenset({"hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/51redefine_family/tiramisu/multi.py b/tests/dictionaries/51redefine_family/tiramisu/multi.py index 564fc78d7..942a87179 100644 --- a/tests/dictionaries/51redefine_family/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_family/tiramisu/multi.py @@ -21,13 +21,13 @@ except: option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -optiondescription_3 = OptionDescription(name="general2", doc="general2", children=[option_4], properties=frozenset({"hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +optiondescription_3 = OptionDescription(name="general2", doc="general2", children=[option_4], properties=frozenset({"hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"normal"})) option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -optiondescription_7 = OptionDescription(name="general2", doc="general2", children=[option_8], properties=frozenset({"hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +optiondescription_7 = OptionDescription(name="general2", doc="general2", children=[option_8], properties=frozenset({"hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9, optiondescription_11]) diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py index a9aeda306..fabd188fe 100644 --- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py +++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py @@ -19,7 +19,7 @@ try: except: from tiramisu import * option_5 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"hidden", "mandatory", "normal"})) -option_1 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_5, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_1 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_5, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_4 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal"})) diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/multi.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/multi.py index a1e62cdc9..69d38e14e 100644 --- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/multi.py @@ -19,14 +19,14 @@ try: except: from tiramisu import * option_5 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"hidden", "mandatory", "normal"})) -option_1 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_5, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_1 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_5, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_4 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3, option_4, option_5]) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_10 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"hidden", "mandatory", "normal"})) -option_6 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_10, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_6 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_10, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) option_7 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) option_8 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_9 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal"})) diff --git a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py index eabccfbcd..b1622fe38 100644 --- a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py +++ b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py @@ -19,7 +19,7 @@ try: except: from tiramisu import * option_4 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"hidden", "mandatory", "normal"})) -option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) option_3 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2, option_3, option_4], properties=frozenset({"basic"})) optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) @@ -29,6 +29,6 @@ option_8 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default optiondescription_5 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="extra", doc="extra", children=[optiondescription_5]) option_10 = StrOption(name="description", doc="description", default="test", properties=frozenset({"mandatory", "normal"})) -optiondescription_9 = OptionDescription(name="external", doc="external", children=[option_10], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) +optiondescription_9 = OptionDescription(name="external", doc="external", children=[option_10], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) optiondescription_13 = OptionDescription(name="extra1", doc="extra1", children=[optiondescription_9]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_12, optiondescription_13]) diff --git a/tests/dictionaries/60extra_externalspacecondition/tiramisu/multi.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/multi.py index 4cc82e569..0932bf731 100644 --- a/tests/dictionaries/60extra_externalspacecondition/tiramisu/multi.py +++ b/tests/dictionaries/60extra_externalspacecondition/tiramisu/multi.py @@ -19,7 +19,7 @@ try: except: from tiramisu import * option_4 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"hidden", "mandatory", "normal"})) -option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) option_3 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2, option_3, option_4], properties=frozenset({"basic"})) optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) @@ -29,11 +29,11 @@ option_8 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default optiondescription_5 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_23 = OptionDescription(name="extra", doc="extra", children=[optiondescription_5]) option_10 = StrOption(name="description", doc="description", default="test", properties=frozenset({"mandatory", "normal"})) -optiondescription_9 = OptionDescription(name="external", doc="external", children=[option_10], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) +optiondescription_9 = OptionDescription(name="external", doc="external", children=[option_10], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) optiondescription_24 = OptionDescription(name="extra1", doc="extra1", children=[optiondescription_9]) optiondescription_21 = OptionDescription(name="1", doc="1", children=[optiondescription_22, optiondescription_23, optiondescription_24]) option_14 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"hidden", "mandatory", "normal"})) -option_12 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_14, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_12 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_14, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) option_13 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_11 = OptionDescription(name="general", doc="général", children=[option_12, option_13, option_14], properties=frozenset({"basic"})) optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_11]) @@ -43,7 +43,7 @@ option_18 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), defaul optiondescription_15 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_16, option_17, option_18], properties=frozenset({"normal"})) optiondescription_27 = OptionDescription(name="extra", doc="extra", children=[optiondescription_15]) option_20 = StrOption(name="description", doc="description", default="test", properties=frozenset({"mandatory", "normal"})) -optiondescription_19 = OptionDescription(name="external", doc="external", children=[option_20], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_16, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) +optiondescription_19 = OptionDescription(name="external", doc="external", children=[option_20], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_16, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) optiondescription_28 = OptionDescription(name="extra1", doc="extra1", children=[optiondescription_19]) optiondescription_25 = OptionDescription(name="2", doc="2", children=[optiondescription_26, optiondescription_27, optiondescription_28]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_21, optiondescription_25]) diff --git a/tests/dictionaries/61extra_auto_freeze/tiramisu/base.py b/tests/dictionaries/61extra_auto_freeze/tiramisu/base.py index 9523aa65b..8e2775163 100644 --- a/tests/dictionaries/61extra_auto_freeze/tiramisu/base.py +++ b/tests/dictionaries/61extra_auto_freeze/tiramisu/base.py @@ -22,7 +22,7 @@ option_2 = BoolOption(name="server_deployed", doc="No change", default=True, pro option_3 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2, option_3], properties=frozenset({"normal"})) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) -option_5 = StrOption(name="mode", doc="mode", default="pre", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_5 = StrOption(name="mode", doc="mode", default="pre", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6, optiondescription_7]) diff --git a/tests/dictionaries/61extra_auto_freeze/tiramisu/multi.py b/tests/dictionaries/61extra_auto_freeze/tiramisu/multi.py index 38245a304..8e4a8c24d 100644 --- a/tests/dictionaries/61extra_auto_freeze/tiramisu/multi.py +++ b/tests/dictionaries/61extra_auto_freeze/tiramisu/multi.py @@ -22,7 +22,7 @@ option_2 = BoolOption(name="server_deployed", doc="No change", default=True, pro option_3 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2, option_3], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) -option_5 = StrOption(name="mode", doc="mode", default="pre", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_5 = StrOption(name="mode", doc="mode", default="pre", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5], properties=frozenset({"basic"})) optiondescription_13 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12, optiondescription_13]) @@ -30,7 +30,7 @@ option_7 = BoolOption(name="server_deployed", doc="No change", default=True, pro option_8 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_6 = OptionDescription(name="general", doc="général", children=[option_7, option_8], properties=frozenset({"normal"})) optiondescription_15 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6]) -option_10 = StrOption(name="mode", doc="mode", default="pre", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_10 = StrOption(name="mode", doc="mode", default="pre", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) optiondescription_9 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_10], properties=frozenset({"basic"})) optiondescription_16 = OptionDescription(name="extra", doc="extra", children=[optiondescription_9]) optiondescription_14 = OptionDescription(name="2", doc="2", children=[optiondescription_15, optiondescription_16]) diff --git a/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/base.py b/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/base.py index a2ad35de1..14f8d5c74 100644 --- a/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/base.py +++ b/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/base.py @@ -19,7 +19,7 @@ try: except: from tiramisu import * option_1 = StrOption(name="condition1", doc="condition1", default="no", properties=frozenset({"mandatory", "normal"})) -option_2 = StrOption(name="condition2", doc="condition2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))})) +option_2 = StrOption(name="condition2", doc="condition2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) option_3 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")}))) option_4 = BoolOption(name="manage", doc="manage", default=True) diff --git a/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/multi.py b/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/multi.py index 2a7f70834..86bcd77f3 100644 --- a/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/multi.py +++ b/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/multi.py @@ -19,7 +19,7 @@ try: except: from tiramisu import * option_1 = StrOption(name="condition1", doc="condition1", default="no", properties=frozenset({"mandatory", "normal"})) -option_2 = StrOption(name="condition2", doc="condition2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))})) +option_2 = StrOption(name="condition2", doc="condition2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) option_5 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")}))) option_6 = BoolOption(name="manage", doc="manage", default=True) @@ -28,7 +28,7 @@ optiondescription_12.impl_set_information('type', "service") optiondescription_11 = OptionDescription(name="services", doc="services", children=[optiondescription_12], properties=frozenset({"hidden"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10, optiondescription_11]) option_3 = StrOption(name="condition1", doc="condition1", default="no", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="condition2", doc="condition2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))})) +option_4 = StrOption(name="condition2", doc="condition2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) option_7 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_4, notraisepropertyerror=True), 'expected_0': ParamValue("yes")}))) option_8 = BoolOption(name="manage", doc="manage", default=True) diff --git a/tests/dictionaries/70services_ip_iplist/tiramisu/base.py b/tests/dictionaries/70services_ip_iplist/tiramisu/base.py index 594f8d952..09b88e7b3 100644 --- a/tests/dictionaries/70services_ip_iplist/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_iplist/tiramisu/base.py @@ -19,7 +19,7 @@ try: except: from tiramisu import * option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -option_2 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")}))})) +option_2 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help)})) optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) option_7 = SymLinkOption(name="name", opt=option_2) option_6 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_1, notraisepropertyerror=True), 'expected_0': ParamValue("yes")}))) diff --git a/tests/dictionaries/70services_ip_iplist/tiramisu/multi.py b/tests/dictionaries/70services_ip_iplist/tiramisu/multi.py index 3f9b7f320..6a77618f0 100644 --- a/tests/dictionaries/70services_ip_iplist/tiramisu/multi.py +++ b/tests/dictionaries/70services_ip_iplist/tiramisu/multi.py @@ -19,7 +19,7 @@ try: except: from tiramisu import * option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -option_2 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")}))})) +option_2 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_1, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help)})) optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) option_9 = SymLinkOption(name="name", opt=option_2) option_8 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_1, notraisepropertyerror=True), 'expected_0': ParamValue("yes")}))) @@ -32,7 +32,7 @@ optiondescription_20.impl_set_information('type', "service") optiondescription_19 = OptionDescription(name="services", doc="services", children=[optiondescription_20], properties=frozenset({"hidden"})) optiondescription_17 = OptionDescription(name="1", doc="1", children=[optiondescription_18, optiondescription_19]) option_3 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -option_4 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")}))})) +option_4 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help)})) optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) option_15 = SymLinkOption(name="name", opt=option_4) option_14 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("yes")}))) diff --git a/tests/dictionaries/70services_ip_leadership/makedict/after.json b/tests/dictionaries/70services_ip_leadership/makedict/after.json index da2c33b93..60c801feb 100644 --- a/tests/dictionaries/70services_ip_leadership/makedict/after.json +++ b/tests/dictionaries/70services_ip_leadership/makedict/after.json @@ -14,9 +14,7 @@ ] }, "services.ntp_service.ip.nut_monitor_host.name": { - "owner": [ - "default" - ], + "owner": "default", "value": [ "192.168.1.0" ] diff --git a/tests/dictionaries/70services_ip_leadership/makedict/before.json b/tests/dictionaries/70services_ip_leadership/makedict/before.json index da2c33b93..60c801feb 100644 --- a/tests/dictionaries/70services_ip_leadership/makedict/before.json +++ b/tests/dictionaries/70services_ip_leadership/makedict/before.json @@ -14,9 +14,7 @@ ] }, "services.ntp_service.ip.nut_monitor_host.name": { - "owner": [ - "default" - ], + "owner": "default", "value": [ "192.168.1.0" ] diff --git a/tests/test_2_makedict.py b/tests/test_2_makedict.py index 80d138fc6..3867c4f71 100644 --- a/tests/test_2_makedict.py +++ b/tests/test_2_makedict.py @@ -1,6 +1,6 @@ from lxml import etree from os.path import isfile, join, isdir -from pytest import fixture, mark +from pytest import fixture from os import listdir, mkdir, environ from json import dump, load, dumps, loads @@ -37,9 +37,9 @@ def test_dir(request): return request.param -async def launch_flattener(test_dir, - filename, - ): +def launch_flattener(test_dir, + filename, + ): makedict_dir = join(test_dir, 'makedict') makedict_file = join(makedict_dir, 'base.json') makedict_before = join(makedict_dir, 'before.json') @@ -49,20 +49,20 @@ async def launch_flattener(test_dir, mod = __import__(modulepath) for token in modulepath.split(".")[1:]: mod = getattr(mod, token) - config = await Config(mod.option_0) + config = Config(mod.option_0) # change default rights - ro_origin = await config.property.getdefault('read_only', 'append') + ro_origin = config.property.getdefault('read_only', 'append') ro_append = frozenset(ro_origin - {'force_store_value'}) - rw_origin = await config.property.getdefault('read_write', 'append') + rw_origin = config.property.getdefault('read_write', 'append') rw_append = frozenset(rw_origin - {'force_store_value'}) - await config.property.setdefault(ro_append, 'read_only', 'append') - await config.property.setdefault(rw_append, 'read_write', 'append') + config.property.setdefault(ro_append, 'read_only', 'append') + config.property.setdefault(rw_append, 'read_write', 'append') - await config.information.set('test_information', 'value') - await config.property.read_only() - await config.property.pop('mandatory') - await config.information.set('info', 'value') - config_dict = await config.value.dict(leader_to_list=True) + config.information.set('test_information', 'value') + config.property.read_only() + config.property.remove('mandatory') + config.information.set('info', 'value') + config_dict = config.value.dict() if filename == 'base': if not isdir(makedict_dir): mkdir(makedict_dir) @@ -91,37 +91,37 @@ async def launch_flattener(test_dir, with open(makedict_file, 'r') as fh: assert load(fh) == loads(dumps(config_dict)), f"error in file {makedict_file}" # - await value_owner(makedict_before, config, filename) + value_owner(makedict_before, config, filename) # deploy - ro = await config.property.getdefault('read_only', 'append') + ro = config.property.getdefault('read_only', 'append') ro = frozenset(list(ro) + ['force_store_value']) - await config.property.setdefault(ro, 'read_only', 'append') - rw = await config.property.getdefault('read_write', 'append') + config.property.setdefault(ro, 'read_only', 'append') + rw = config.property.getdefault('read_write', 'append') rw = frozenset(list(rw) + ['force_store_value']) - await config.property.setdefault(rw, 'read_write', 'append') - await config.property.add('force_store_value') + config.property.setdefault(rw, 'read_write', 'append') + config.property.add('force_store_value') # - await value_owner(makedict_after, config, filename) + value_owner(makedict_after, config, filename) -async def value_owner(makedict_value_owner, config, filename): +def value_owner(makedict_value_owner, config, filename): ret = {} - for key in await config.option.list(recursive=True): - path = await key.option.path() - if await key.option.isfollower(): + for key in config.option.list(recursive=True): + path = key.option.path() + if not key.option.issymlinkoption() and key.option.isfollower(): value = [] owner = [] - for idx in range(0, await key.value.len()): + for idx in range(0, key.value.len()): try: option = config.option(path, idx) - value.append(await option.value.get()) - owner.append(await option.owner.get()) + value.append(option.value.get()) + owner.append(option.owner.get()) except PropertiesOptionError as err: value.append(str(err)) owner.append('error') else: - value = await key.value.get() - owner = await key.owner.get() + value = key.value.get() + owner = key.owner.get() ret[path] = {'owner': owner, 'value': value, } @@ -141,13 +141,11 @@ async def value_owner(makedict_value_owner, config, filename): assert load(fh) == loads(dumps(ret)), f"error in file {makedict_value_owner}" -@mark.asyncio -async def test_dictionary(test_dir): +def test_dictionary(test_dir): test_dir = join(dico_dirs, test_dir) - await launch_flattener(test_dir, 'base') + launch_flattener(test_dir, 'base') -@mark.asyncio -async def test_dictionary_multi(test_dir): +def test_dictionary_multi(test_dir): test_dir = join(dico_dirs, test_dir) - await launch_flattener(test_dir, 'multi') + launch_flattener(test_dir, 'multi') diff --git a/tests/test_3_template.py b/tests/test_3_template.py index 1e44e1e57..f813fce35 100644 --- a/tests/test_3_template.py +++ b/tests/test_3_template.py @@ -1,7 +1,7 @@ from os import listdir, mkdir, readlink from os.path import join, isdir, isfile, islink from shutil import rmtree -from pytest import fixture, mark, raises +from pytest import fixture, raises from lxml.etree import parse from tiramisu import Config @@ -41,7 +41,7 @@ def find_files(dirname: str, files.add(join(*root_file)) -async def templates(test_dir, filename, root, engine_name, only_one=False): +def templates(test_dir, filename, root, engine_name, only_one=False): test_dir = join(template_dirs, test_dir) tmp_dir = join(test_dir, '..', 'tmp') @@ -49,8 +49,8 @@ async def templates(test_dir, filename, root, engine_name, only_one=False): mod = __import__(modulepath) for token in modulepath.split(".")[1:]: mod = getattr(mod, token) - config = await Config(mod.option_0) - await config.property.read_only() + config = Config(mod.option_0) + config.property.read_only() if filename == 'multi': sconfig = config config = config.option(root) @@ -91,7 +91,7 @@ async def templates(test_dir, filename, root, engine_name, only_one=False): rmtree(dest_dir) mkdir(dest_dir) if template is None: - await engine.instance_files() + engine.instance_files() list_results = set() if isdir(join(test_dir, 'result')): find_files(join(test_dir, 'result'), @@ -102,34 +102,34 @@ async def templates(test_dir, filename, root, engine_name, only_one=False): list_results = set() included = False activate = True - for service in await config.option('services').option.list('all'): - names = [await o.option.name() for o in await service.option.list('optiondescription')] + for service in config.option('services').list('all'): + names = [o.option.name() for o in service.list('optiondescription')] if 'files' in names: - for file in await service.option('files').list('optiondescription'): - if not await file.option('source').value.get() == template: + for file in service.option('files').list('optiondescription'): + if not file.option('source').value.get() == template: continue - included = await file.information.get('included', 'no') != 'no' - values = await file.option('name').value.get() + included = file.information.get('included', 'no') != 'no' + values = file.option('name').value.get() if isinstance(values, list): for value in values: list_results.add(value[1:]) else: list_results.add(values[1:]) - if not await file.option('activate').value.get(): + if not file.option('activate').value.get(): activate = False # if template is an overrides if not list_results and 'overrides' in names: - for override in await service.option('overrides').list('optiondescription'): - if await override.option.description() == template: + for override in service.option('overrides').list('optiondescription'): + if override.option.description() == template: return # if template is a service - if not list_results and template == await service.option.description() and await service.information.get('engine', None): + if not list_results and template == service.option.description() and service.information.get('engine', None): return #this file is include and not declared if template.startswith('inc') and not list_results: return try: - await engine.instance_file(template) + engine.instance_file(template) except TemplateError as err: if 'No such file or directory' in str(err): @@ -172,43 +172,39 @@ async def templates(test_dir, filename, root, engine_name, only_one=False): rmtree(tmp_dir) -@mark.asyncio -async def test_templates(test_dir): +def test_templates(test_dir): for engine in ['base', 'systemd']: not_file = join(template_dirs, test_dir, 'no_' + engine) if isfile(not_file): with raises(Exception) as err: - await templates(test_dir, 'base', '1', engine) + templates(test_dir, 'base', '1', engine) else: - await templates(test_dir, 'base', '1', engine) + templates(test_dir, 'base', '1', engine) -@mark.asyncio -async def test_template(test_dir): +def test_template(test_dir): for engine in ['base', 'systemd']: not_file = join(template_dirs, test_dir, 'no_' + engine) if isfile(not_file): continue - await templates(test_dir, 'base', '1', engine, only_one=True) + templates(test_dir, 'base', '1', engine, only_one=True) -@mark.asyncio -async def test_template_multi_1(test_dir): +def test_template_multi_1(test_dir): for engine in ['base', 'systemd']: not_file = join(template_dirs, test_dir, 'no_' + engine) if isfile(not_file): with raises(Exception) as err: - await templates(test_dir, 'multi', '1', engine) + templates(test_dir, 'multi', '1', engine) else: - await templates(test_dir, 'multi', '1', engine) + templates(test_dir, 'multi', '1', engine) -@mark.asyncio -async def test_template_multi_2(test_dir): +def test_template_multi_2(test_dir): for engine in ['base', 'systemd']: not_file = join(template_dirs, test_dir, 'no_' + engine) if isfile(not_file): with raises(Exception) as err: - await templates(test_dir, 'multi', '1', engine) + templates(test_dir, 'multi', '1', engine) else: - await templates(test_dir, 'multi', '1', engine) + templates(test_dir, 'multi', '1', engine)