diff --git a/src/rougail/annotator/check.py b/src/rougail/annotator/check.py index afcf54494..d18a30a40 100644 --- a/src/rougail/annotator/check.py +++ b/src/rougail/annotator/check.py @@ -32,6 +32,7 @@ from copy import copy from rougail.annotator.target import TargetAnnotator from rougail.annotator.param import ParamAnnotator +from rougail.annotator.fill import get_jinja_variable_to_param from rougail.i18n import _ from rougail.error import DictConsistencyError, display_xmlfiles @@ -60,6 +61,7 @@ class Annotator(TargetAnnotator, ParamAnnotator): self.convert_target(constraints.check, path_prefix) self.convert_param(constraints.check, path_prefix) self.check_check(constraints) + self.convert_check_jinja(constraints, path_prefix) self.check_change_warning(constraints) self.convert_valid_entier(constraints) self.convert_check(constraints) @@ -72,7 +74,7 @@ class Annotator(TargetAnnotator, ParamAnnotator): """ remove_indexes = [] for check_idx, check in enumerate(constraints.check): - if not check.name in self.functions and not self.objectspace.just_doc: + if check.type == 'function' and not check.name in self.functions and not self.objectspace.just_doc: msg = _(f'cannot find check function "{check.name}"') raise DictConsistencyError(msg, 1, check.xmlfiles) if hasattr(check, 'param') and check.param == []: @@ -81,15 +83,6 @@ class Annotator(TargetAnnotator, ParamAnnotator): for idx in remove_indexes: del constraints.check[idx] - def check_change_warning(self, - constraints, - ): - """convert level to "warnings_only" - """ - for check in constraints.check: - check.warnings_only = check.level == 'warning' - check.level = None - def convert_valid_entier(self, constraints, ) -> None: @@ -121,6 +114,48 @@ class Annotator(TargetAnnotator, ParamAnnotator): for idx in remove_indexes: del constraints.check[idx] + def convert_check_jinja(self, + constraints, + path_prefix, + ) -> None: + """convert jinja to a function + """ + for check in constraints.check: + if check.type != 'jinja': + continue + if len(check.target) > 1: + msg = _(f'a check with type jinja cannot have more than one target') + raise DictConsistencyError(msg, 92, check.xmlfiles) + if not hasattr(check, 'param'): + check.param = [] + jinja_text = check.name + check.name = 'valid_with_jinja' + new_param = self.objectspace.param(check.xmlfiles) + new_param.name = '__internal_jinja' + new_param.text = jinja_text + new_param.type = 'jinja' + check.param.append(new_param) + if path_prefix: + path = check.target[0].name.path.split('.', 1)[-1] + else: + path = check.target[0].name.path + get_jinja_variable_to_param(jinja_text, + self.objectspace, + check, + path_prefix, + check.target[0].name.name, + path, + ) + + def check_change_warning(self, + constraints, + ): + """convert level to "warnings_only" + """ + for check in constraints.check: + check.warnings_only = check.level == 'warning' + check.level = None + def convert_check(self, constraints, ) -> None: diff --git a/src/rougail/annotator/family.py b/src/rougail/annotator/family.py index 42c12f574..294ca75d8 100644 --- a/src/rougail/annotator/family.py +++ b/src/rougail/annotator/family.py @@ -234,7 +234,8 @@ class Annotator(Walk): self._change_variable_mode(variable, family_mode, is_leadership) if self.modes[min_variable_mode] > self.modes[variable.mode]: min_variable_mode = variable.mode - if not isinstance(family, self.objectspace.family) or is_leadership: + if not isinstance(family, (self.objectspace.family, self.objectspace.variables)) or \ + is_leadership: # it's Variable, Service, ... and leadership return if not hasattr(family, 'mode'): diff --git a/src/rougail/annotator/fill.py b/src/rougail/annotator/fill.py index 514d282ac..46eb8e875 100644 --- a/src/rougail/annotator/fill.py +++ b/src/rougail/annotator/fill.py @@ -32,10 +32,93 @@ from rougail.i18n import _ from rougail.error import DictConsistencyError from rougail.annotator.target import TargetAnnotator -from rougail.annotator.param import ParamAnnotator +from rougail.annotator.param import ParamAnnotator, set_variable_to_param -CALC_MULTI = ('calc_value', 'calc_list', 'get_range', 'calc_val_first_value', 'unbound_filename', 'zone_information', 'get_certificates', 'nsd_filename', 'get_linked_configuration', 'get_internal_zones', 'nsd_concat_lists', 'get_internal_info_in_zone') +from jinja2.sandbox import SandboxedEnvironment +from jinja2 import Undefined, UndefinedError, DictLoader +from jinja2.utils import missing + + +class CollectUndefined(Undefined): + def __init__( + self, + hint=None, + obj=missing, + name=None, + exc=UndefinedError, + subname=None, + ) -> None: + self._undefined_hint = hint + self._undefined_obj = obj + self._undefined_name = name + self._undefined_exception = exc + if subname: + full_name = subname + '.' + else: + full_name = '' + full_name += self._undefined_name + self.variables.add(full_name) + self._undefined_full_name = full_name + + def __getattr__(self, name): + return CollectUndefined(name=name, subname=self._undefined_full_name) + + +def get_jinja_variable_to_param(jinja_text, + objectspace, + obj, + path_prefix, + variable_name, + variable_path, + ): + CollectUndefined.variables = set() + try: + SandboxedEnvironment(loader=DictLoader({'tmpl': jinja_text}), undefined=CollectUndefined).get_template('tmpl').render() + except UndefinedError as err: + msg = _(f'error in jinja "{jinja_text}": {err}') + raise DictConsistencyError(msg, 91, obj.xmlfiles) from err + variables = list(CollectUndefined.variables) + variables.sort() + for variable in variables: + new_param = objectspace.param(obj.xmlfiles) + if variable in [variable_name, variable_path]: + new_param.name = '__internal_key' + new_param.type = 'string' + new_param.text = variable + else: + new_param.name = variable + new_param.text = variable + try: + set_variable_to_param(new_param, + objectspace, + None, + obj.namespace, + path_prefix, + None, + ) + except DictConsistencyError as err: + if err.errno != 42: + raise err from err + continue + new_param.type = 'variable' + obj.param.append(new_param) + + +CALC_MULTI = ('calc_value', + 'calc_list', + 'get_range', + 'calc_val_first_value', + 'unbound_filename', + 'zone_information', + 'get_certificates', + 'nsd_filename', + 'get_linked_configuration', + 'get_internal_zones', + 'nsd_concat_lists', + 'get_internal_info_in_zone', + 'jinja_to_function', + ) class Annotator(TargetAnnotator, ParamAnnotator): @@ -60,7 +143,7 @@ class Annotator(TargetAnnotator, ParamAnnotator): continue self.convert_target(constraints.fill, path_prefix) self.convert_param(constraints.fill, path_prefix) - self.fill_to_value(constraints) + self.fill_to_value(constraints, path_prefix) del constraints.fill def calc_is_multi(self, variable: 'self.objectspace.variable') -> bool: @@ -71,14 +154,29 @@ class Annotator(TargetAnnotator, ParamAnnotator): return True return not self.objectspace.paths.is_follower(variable) - def fill_to_value(self, constraints) -> None: + def fill_to_value(self, constraints, path_prefix: str) -> None: """valid and manage """ for fill in constraints.fill: # test if the function exists - if not self.objectspace.just_doc and fill.name not in self.functions: + if fill.type == 'jinja': + jinja_text = fill.name + fill.name = 'jinja_to_function' + if not hasattr(fill, 'param'): + fill.param = [] + new_param = self.objectspace.param(fill.xmlfiles) + new_param.name = '__internal_jinja' + new_param.text = jinja_text + new_param.type = 'jinja' + fill.param.append(new_param) + if len(fill.target) > 1: + msg = _(f'a fill with type jinja cannot have more than one target') + raise DictConsistencyError(msg, 92, fill.xmlfiles) + elif not self.objectspace.just_doc and fill.name not in self.functions: msg = _(f'cannot find fill function "{fill.name}"') raise DictConsistencyError(msg, 25, fill.xmlfiles) + target_type = None + target_multi = False for target in fill.target: # create an object value value = self.objectspace.value(fill.xmlfiles) @@ -96,3 +194,24 @@ class Annotator(TargetAnnotator, ParamAnnotator): # manage params if hasattr(fill, 'param') and fill.param: value.param = fill.param + target_type = target.name.type + target_multi = target.name.multi + if fill.type == 'jinja': + new_param = self.objectspace.param(fill.xmlfiles) + new_param.name = '__internal_type' + new_param.text = target_type + fill.param.append(new_param) + # + new_param = self.objectspace.param(fill.xmlfiles) + new_param.name = '__internal_multi' + new_param.text = target_multi + new_param.type = 'boolean' + fill.param.append(new_param) + # + get_jinja_variable_to_param(jinja_text, + self.objectspace, + fill, + path_prefix, + None, + None, + ) diff --git a/src/rougail/annotator/param.py b/src/rougail/annotator/param.py index 386d33b6d..512e56949 100644 --- a/src/rougail/annotator/param.py +++ b/src/rougail/annotator/param.py @@ -38,6 +38,36 @@ from rougail.i18n import _ from rougail.error import DictConsistencyError +def set_variable_to_param(param, + objectspace, + name, + namespace, + path_prefix, + variable_type, + ): + param.text, suffix = objectspace.paths.get_variable_with_suffix(param.text, + namespace, + param.xmlfiles, + path_prefix, + ) + if variable_type and param.text.type != variable_type: + msg = _(f'"{name}" has type "{variable_type}" but param ' + f'has type "{param.text.type}"') + raise DictConsistencyError(msg, 26, param.xmlfiles) + if not suffix: + return + param.suffix = suffix + namespace = param.text.namespace + family_path = objectspace.paths.get_variable_family_path(param.text.path, + namespace, + force_path_prefix=path_prefix, + ) + param.family = objectspace.paths.get_family(family_path, + namespace, + path_prefix, + ) + + class ParamAnnotator: """Param annotator """ @@ -72,26 +102,13 @@ class ParamAnnotator: elif param.type == 'variable': if not isinstance(param.text, self.objectspace.variable): try: - param.text, suffix = self.objectspace.paths.get_variable_with_suffix(param.text, - obj.namespace, - param.xmlfiles, - path_prefix, - ) - if variable_type and param.text.type != variable_type: - msg = _(f'"{obj.name}" has type "{variable_type}" but param ' - f'has type "{param.text.type}"') - raise DictConsistencyError(msg, 26, param.xmlfiles) - if suffix: - param.suffix = suffix - namespace = param.text.namespace - family_path = self.objectspace.paths.get_variable_family_path(param.text.path, - namespace, - force_path_prefix=path_prefix, - ) - param.family = self.objectspace.paths.get_family(family_path, - namespace, - path_prefix, - ) + set_variable_to_param(param, + self.objectspace, + obj.name, + obj.namespace, + path_prefix, + variable_type, + ) except DictConsistencyError as err: if not self.objectspace.just_doc and (err.errno != 42 or not param.optional): raise err diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd index b4539ec76..35adbdc96 100644 --- a/src/rougail/data/rougail.dtd +++ b/src/rougail/data/rougail.dtd @@ -151,10 +151,12 @@ + + diff --git a/src/rougail/data/rougail.yml b/src/rougail/data/rougail.yml index d418e1c6b..fb37010cf 100644 --- a/src/rougail/data/rougail.yml +++ b/src/rougail/data/rougail.yml @@ -1492,6 +1492,11 @@ mapping: type: str name: type: str + type: + type: str + enum: + - "function" + - "jinja" check: required: false type: seq @@ -1550,6 +1555,11 @@ mapping: type: str name: type: str + type: + type: str + enum: + - "function" + - "jinja" level: type: str enum: diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index eaa2c44b0..68cc2716f 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -60,6 +60,7 @@ class TiramisuReflector: cfg, ): self.cfg = cfg + self.jinja_added = False self.text = {'header': [], 'option': [], 'optiondescription': [], @@ -92,14 +93,55 @@ class TiramisuReflector: self.text['header'].append(f"setattr(func, '{func}', {func})") self.text['header'].extend(["try:", " from tiramisu4 import *", + " from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES", "except:", " from tiramisu import *", + " from tiramisu.setting import ALLOWED_LEADER_PROPERTIES", ]) + for mode in objectspace.rougailconfig["modes_level"]: + self.text['header'].append(f'ALLOWED_LEADER_PROPERTIES.add("{mode}")') self.objectspace = objectspace self.make_tiramisu_objects() if self.cfg['export_with_import'] and (self.cfg['force_convert_dyn_option_description'] or self.objectspace.has_dyn_option is True): self.text['header'].append("from rougail.tiramisu import ConvertDynOptionDescription") + def add_jinja_to_function(self, + variable_name: str, + jinja: str, + ) -> None: + if not self.jinja_added: + self.text['header'].extend(["from jinja2 import StrictUndefined, DictLoader", + "from jinja2.sandbox import SandboxedEnvironment", + "from rougail.annotator.variable import CONVERT_OPTION", + "def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs):", + " kw = {}", + " for key, value in kwargs.items():", + " if '.' in key:", + " c_kw = kw", + " path, var = key.rsplit('.', 1)", + " for subkey in path.split('.'):", + " c_kw = c_kw.setdefault(subkey, {})", + " c_kw[var] = value", + " else:", + " kw[key] = value", + " values = ENV.get_template(__internal_jinja).render(kw)", + " convert = CONVERT_OPTION[__internal_type].get('func', str)", + " if __internal_multi:", + " return [convert(val) for val in values.split(',')]", + " return convert(values)", + "def valid_with_jinja(value, **kwargs):", + " kwargs[kwargs.pop('__internal_key')] = value", + " value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs)", + " if value:", + " raise ValueError(value)", + "func.jinja_to_function = jinja_to_function", + "func.valid_with_jinja = valid_with_jinja", + "dict_env = {}", + ]) + self.jinja_added = True + jinja_text = dumps(jinja, ensure_ascii=False) + self.text['header'].append(f"dict_env['{variable_name}'] = {jinja_text}") + def make_tiramisu_objects(self) -> None: """make tiramisu objects """ @@ -107,15 +149,13 @@ class TiramisuReflector: baseelt.reflector_name = f'option_0{self.objectspace.rougailconfig["suffix"]}' self.set_name(baseelt) basefamily = Family(baseelt, - self.text, - self.objectspace, + self, ) if not self.objectspace.paths.has_path_prefix(): for elt in self.reorder_family(self.objectspace.space): self.populate_family(basefamily, elt, ) -# basefamily.populate_informations() if not hasattr(basefamily.elt, 'information'): basefamily.elt.information = self.objectspace.information(None) basefamily.elt.information = self.objectspace.paths.get_providers_path() @@ -126,8 +166,7 @@ class TiramisuReflector: space = self.objectspace.space.variables[path_prefix] self.set_name(space) baseprefix = Family(space, - self.text, - self.objectspace, + self, ) basefamily.add(baseprefix) for elt in self.reorder_family(space): @@ -140,7 +179,6 @@ class TiramisuReflector: setattr(baseprefix.elt.information, key, value) for key, value in self.objectspace.paths.get_suppliers_path(path_prefix).items(): setattr(baseprefix.elt.information, key, value) -# baseprefix.populate_informations() baseelt.name = normalize_family(self.cfg['base_option_name']) baseelt.doc = self.cfg['base_option_name'] baseelt.reflector_object.get([], baseelt.doc, 'base') # pylint: disable=E1101 @@ -167,8 +205,7 @@ class TiramisuReflector: """ self.set_name(elt) family = Family(elt, - self.text, - self.objectspace, + self, ) parent_family.add(family) for children in vars(elt).values(): @@ -187,8 +224,7 @@ class TiramisuReflector: if isinstance(child, self.objectspace.variable): self.set_name(child) family.add(Variable(child, - self.text, - self.objectspace, + self, )) else: self.populate_family(family, @@ -207,6 +243,10 @@ class TiramisuReflector: def get_text(self): """Get text """ + if self.jinja_added: + self.text['header'].extend(["ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined)", + "ENV.compile_templates('jinja_caches', zip=None)", + ]) return '\n'.join(self.text['header'] + self.text['option'] + self.text['optiondescription']) @@ -215,13 +255,11 @@ class Common: """ def __init__(self, elt, - text, - objectspace, + tiramisu, ): self.elt = elt self.option_name = None - self.text = text - self.objectspace = objectspace + self.tiramisu = tiramisu self.elt.reflector_object = self self.object_type = None @@ -256,7 +294,7 @@ class Common: #name = 'optiondescription' else: name = 'option' - self.text[name].append(f'{self.option_name} = {self.object_type}({attrib})') + self.tiramisu.text[name].append(f'{self.option_name} = {self.object_type}({attrib})') def _populate_attrib(self, keys: dict, @@ -277,7 +315,7 @@ class Common: properties = [self.convert_str(property_) for property_ in values if isinstance(property_, str)] calc_properties = [self.calc_properties(property_) for property_ in values \ - if isinstance(property_, self.objectspace.property_)] + if isinstance(property_, self.tiramisu.objectspace.property_)] return 'frozenset({' + ', '.join(sorted(properties) + calc_properties) + '})' def calc_properties(self, @@ -307,7 +345,7 @@ class Common: continue if isinstance(value, str): value = self.convert_str(value) - self.text['option'].append(f"{self.option_name}.impl_set_information('{key}', {value})") + self.tiramisu.text['option'].append(f"{self.option_name}.impl_set_information('{key}', {value})") def populate_param(self, param, @@ -332,6 +370,9 @@ class Common: return 'ParamSuffix()' if param.type == 'index': return 'ParamIndex()' + if param.type == 'jinja': + self.tiramisu.add_jinja_to_function(self.elt.path, param.text) + return f'ParamValue("{self.elt.path}")' value = self.convert_str(param.text) return f'ParamValue({value})' @@ -363,10 +404,9 @@ class Variable(Common): """ def __init__(self, elt, - text, - objectspace, + tiramisu, ): - super().__init__(elt, text, objectspace) + super().__init__(elt, tiramisu) self.object_type = CONVERT_OPTION[elt.type]['opttype'] def _populate_attrib(self, @@ -390,7 +430,7 @@ class Variable(Common): value = getattr(self.elt, key) if isinstance(value, str): value = self.convert_str(value) - elif isinstance(value, self.objectspace.value): + elif isinstance(value, self.tiramisu.objectspace.value): value = self.calculation_value(value, [], calc_multi=value.calc_multi) keys[key] = value if hasattr(self.elt, 'validators'): @@ -444,12 +484,11 @@ class Family(Common): """ def __init__(self, elt, - text, - objectspace, + tiramisu, ): - super().__init__(elt, text, objectspace) + super().__init__(elt, tiramisu) if hasattr(self.elt, 'suffixes'): - self.objectspace.has_dyn_option = True + self.tiramisu.objectspace.has_dyn_option = True self.object_type = 'ConvertDynOptionDescription' elif hasattr(self.elt, 'leadership') and self.elt.leadership: self.object_type = 'Leadership' diff --git a/tests/dictionaries/00empty/tiramisu/base.py b/tests/dictionaries/00empty/tiramisu/base.py index fbe82140e..d143ac176 100644 --- a/tests/dictionaries/00empty/tiramisu/base.py +++ b/tests/dictionaries/00empty/tiramisu/base.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = BoolOption(name="activate", doc="activate", default=True) option_2 = BoolOption(name="manage", doc="manage", default=True) optiondescription_4 = OptionDescription(name="tata_service", doc="tata.service", children=[option_1, option_2]) diff --git a/tests/dictionaries/00empty/tiramisu/multi.py b/tests/dictionaries/00empty/tiramisu/multi.py index 257f3d598..8a3dd5d53 100644 --- a/tests/dictionaries/00empty/tiramisu/multi.py +++ b/tests/dictionaries/00empty/tiramisu/multi.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = BoolOption(name="activate", doc="activate", default=True) option_2 = BoolOption(name="manage", doc="manage", default=True) optiondescription_7 = OptionDescription(name="tata_service", doc="tata.service", children=[option_1, option_2]) diff --git a/tests/dictionaries/00load_autofreeze/tiramisu/base.py b/tests/dictionaries/00load_autofreeze/tiramisu/base.py index 231a621b5..d0d5a2e05 100644 --- a/tests/dictionaries/00load_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreeze/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"basic"})) 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 6dd3c0e1b..cce87cd7e 100644 --- a/tests/dictionaries/00load_autofreeze/tiramisu/multi.py +++ b/tests/dictionaries/00load_autofreeze/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"basic"})) 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, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"basic"})) 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 d69c1a69a..779f4d13b 100644 --- a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) 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 ca2b9dce4..c195fb228 100644 --- a/tests/dictionaries/00load_autofreezeexpert/tiramisu/multi.py +++ b/tests/dictionaries/00load_autofreezeexpert/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) 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, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"normal"})) 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_autosave/tiramisu/base.py b/tests/dictionaries/00load_autosave/tiramisu/base.py index d0fb5ba38..f5c517efc 100644 --- a/tests/dictionaries/00load_autosave/tiramisu/base.py +++ b/tests/dictionaries/00load_autosave/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"basic", "force_store_value", "mandatory"})) optiondescription_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"basic"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/00load_autosave/tiramisu/multi.py b/tests/dictionaries/00load_autosave/tiramisu/multi.py index d84489707..1f0bbe68e 100644 --- a/tests/dictionaries/00load_autosave/tiramisu/multi.py +++ b/tests/dictionaries/00load_autosave/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"basic", "force_store_value", "mandatory"})) optiondescription_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"basic"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_4 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"basic", "force_store_value", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="général", children=[option_6], properties=frozenset({"basic"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, optiondescription_5]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, optiondescription_5], properties=frozenset({"basic"})) 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/00load_autosaveexpert/tiramisu/base.py b/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py index 98d96140b..770e2cb42 100644 --- a/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py +++ b/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"expert", "force_store_value", "mandatory"})) optiondescription_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"expert"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/00load_autosaveexpert/tiramisu/multi.py b/tests/dictionaries/00load_autosaveexpert/tiramisu/multi.py index edc28edab..8a431ec4e 100644 --- a/tests/dictionaries/00load_autosaveexpert/tiramisu/multi.py +++ b/tests/dictionaries/00load_autosaveexpert/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"expert", "force_store_value", "mandatory"})) optiondescription_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"expert"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_4 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "force_store_value", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="général", children=[option_6], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, optiondescription_5]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, optiondescription_5], properties=frozenset({"normal"})) 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/00load_comment/tiramisu/base.py b/tests/dictionaries/00load_comment/tiramisu/base.py index f0372dc7b..de3c63d9f 100644 --- a/tests/dictionaries/00load_comment/tiramisu/base.py +++ b/tests/dictionaries/00load_comment/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/00load_comment/tiramisu/multi.py b/tests/dictionaries/00load_comment/tiramisu/multi.py index 827236cba..6428e06da 100644 --- a/tests/dictionaries/00load_comment/tiramisu/multi.py +++ b/tests/dictionaries/00load_comment/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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_notype/tiramisu/base.py b/tests/dictionaries/00load_notype/tiramisu/base.py index 688094695..2e9ba75fc 100644 --- a/tests/dictionaries/00load_notype/tiramisu/base.py +++ b/tests/dictionaries/00load_notype/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_3 = StrOption(name="without_type", doc="without_type", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/00load_notype/tiramisu/multi.py b/tests/dictionaries/00load_notype/tiramisu/multi.py index 817d0f4ba..e26761811 100644 --- a/tests/dictionaries/00load_notype/tiramisu/multi.py +++ b/tests/dictionaries/00load_notype/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_3 = StrOption(name="without_type", doc="without_type", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_6 = StrOption(name="without_type", doc="without_type", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="général", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/00load_save/tiramisu/base.py b/tests/dictionaries/00load_save/tiramisu/base.py index f0372dc7b..de3c63d9f 100644 --- a/tests/dictionaries/00load_save/tiramisu/base.py +++ b/tests/dictionaries/00load_save/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/00load_save/tiramisu/multi.py b/tests/dictionaries/00load_save/tiramisu/multi.py index 827236cba..6428e06da 100644 --- a/tests/dictionaries/00load_save/tiramisu/multi.py +++ b/tests/dictionaries/00load_save/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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_subfolder/tiramisu/base.py b/tests/dictionaries/00load_subfolder/tiramisu/base.py index 50f2b663a..8077aa3a6 100644 --- a/tests/dictionaries/00load_subfolder/tiramisu/base.py +++ b/tests/dictionaries/00load_subfolder/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_3 = 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="général", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/00load_subfolder/tiramisu/multi.py b/tests/dictionaries/00load_subfolder/tiramisu/multi.py index cf66afc96..4aefc708f 100644 --- a/tests/dictionaries/00load_subfolder/tiramisu/multi.py +++ b/tests/dictionaries/00load_subfolder/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_3 = 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="général", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="général", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/01auto_autofreeze/tiramisu/base.py b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py index 33b4e55af..1725d234a 100644 --- a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"basic"})) 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 3177d086d..c4f0540cb 100644 --- a/tests/dictionaries/01auto_autofreeze/tiramisu/multi.py +++ b/tests/dictionaries/01auto_autofreeze/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"basic"})) 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, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"basic"})) 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_base/tiramisu/base.py b/tests/dictionaries/01auto_base/tiramisu/base.py index f4cd902f7..557b85fbb 100644 --- a/tests/dictionaries/01auto_base/tiramisu/base.py +++ b/tests/dictionaries/01auto_base/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01auto_base/tiramisu/multi.py b/tests/dictionaries/01auto_base/tiramisu/multi.py index 6e35dd533..f0173e877 100644 --- a/tests/dictionaries/01auto_base/tiramisu/multi.py +++ b/tests/dictionaries/01auto_base/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_6 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/10leadership_mandatory/__init__.py b/tests/dictionaries/01auto_jinja_base/__init__.py similarity index 100% rename from tests/dictionaries/10leadership_mandatory/__init__.py rename to tests/dictionaries/01auto_jinja_base/__init__.py diff --git a/tests/dictionaries/01auto_jinja_base/makedict/after.json b/tests/dictionaries/01auto_jinja_base/makedict/after.json new file mode 100644 index 000000000..6ebfbbe96 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_base/makedict/after.json @@ -0,0 +1,10 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + }, + "rougail.general.mode_conteneur_actif1": { + "owner": "default", + "value": "non" + } +} diff --git a/tests/dictionaries/01auto_jinja_base/makedict/base.json b/tests/dictionaries/01auto_jinja_base/makedict/base.json new file mode 100644 index 000000000..3f1a7b004 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_base/makedict/base.json @@ -0,0 +1,4 @@ +{ + "rougail.general.mode_conteneur_actif": "non", + "rougail.general.mode_conteneur_actif1": "non" +} diff --git a/tests/dictionaries/01auto_jinja_base/makedict/before.json b/tests/dictionaries/01auto_jinja_base/makedict/before.json new file mode 100644 index 000000000..6ebfbbe96 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_base/makedict/before.json @@ -0,0 +1,10 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + }, + "rougail.general.mode_conteneur_actif1": { + "owner": "default", + "value": "non" + } +} diff --git a/tests/dictionaries/01auto_jinja_base/tiramisu/base.py b/tests/dictionaries/01auto_jinja_base/tiramisu/base.py new file mode 100644 index 000000000..8e310f962 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_base/tiramisu/base.py @@ -0,0 +1,60 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['rougail.general.mode_conteneur_actif'] = "{{ mode_conteneur_actif1 }}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) +option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("rougail.general.mode_conteneur_actif"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'mode_conteneur_actif1': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) +optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01auto_jinja_base/tiramisu/multi.py b/tests/dictionaries/01auto_jinja_base/tiramisu/multi.py new file mode 100644 index 000000000..d83d19c42 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_base/tiramisu/multi.py @@ -0,0 +1,67 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['1.rougail.general.mode_conteneur_actif'] = "{{ mode_conteneur_actif1 }}" +dict_env['2.rougail.general.mode_conteneur_actif'] = "{{ mode_conteneur_actif1 }}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) +option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("1.rougail.general.mode_conteneur_actif"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'mode_conteneur_actif1': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) +optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) +option_6 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) +option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("2.rougail.general.mode_conteneur_actif"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'mode_conteneur_actif1': ParamOption(option_6)})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) +optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) +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/01auto_jinja_base/xml/00-base.xml b/tests/dictionaries/01auto_jinja_base/xml/00-base.xml new file mode 100644 index 000000000..e1cc52f8e --- /dev/null +++ b/tests/dictionaries/01auto_jinja_base/xml/00-base.xml @@ -0,0 +1,18 @@ + + + + + + + non + + + + + + mode_conteneur_actif + + + diff --git a/tests/dictionaries/01auto_jinja_base/yml/00-base.yml b/tests/dictionaries/01auto_jinja_base/yml/00-base.yml new file mode 100644 index 000000000..5427f30a3 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_base/yml/00-base.yml @@ -0,0 +1,23 @@ +version: '0.10' +variables: +- family: + - name: general + variables: + - variable: + - name: mode_conteneur_actif + type: string + description: No change + hidden: true + value: + - text: non + - name: mode_conteneur_actif1 + type: string + description: No change + value: + - text: non +constraints: +- fill: + - name: '{{ mode_conteneur_actif1 }}' + type: jinja + target: + - text: mode_conteneur_actif diff --git a/tests/dictionaries/01auto_jinja_full_path/__init__.py b/tests/dictionaries/01auto_jinja_full_path/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/01auto_jinja_full_path/makedict/after.json b/tests/dictionaries/01auto_jinja_full_path/makedict/after.json new file mode 100644 index 000000000..6ebfbbe96 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_full_path/makedict/after.json @@ -0,0 +1,10 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + }, + "rougail.general.mode_conteneur_actif1": { + "owner": "default", + "value": "non" + } +} diff --git a/tests/dictionaries/01auto_jinja_full_path/makedict/base.json b/tests/dictionaries/01auto_jinja_full_path/makedict/base.json new file mode 100644 index 000000000..3f1a7b004 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_full_path/makedict/base.json @@ -0,0 +1,4 @@ +{ + "rougail.general.mode_conteneur_actif": "non", + "rougail.general.mode_conteneur_actif1": "non" +} diff --git a/tests/dictionaries/01auto_jinja_full_path/makedict/before.json b/tests/dictionaries/01auto_jinja_full_path/makedict/before.json new file mode 100644 index 000000000..6ebfbbe96 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_full_path/makedict/before.json @@ -0,0 +1,10 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + }, + "rougail.general.mode_conteneur_actif1": { + "owner": "default", + "value": "non" + } +} diff --git a/tests/dictionaries/01auto_jinja_full_path/tiramisu/base.py b/tests/dictionaries/01auto_jinja_full_path/tiramisu/base.py new file mode 100644 index 000000000..9a2616f59 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_full_path/tiramisu/base.py @@ -0,0 +1,60 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['rougail.general.mode_conteneur_actif'] = "{{ rougail.general.mode_conteneur_actif1 }}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) +option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("rougail.general.mode_conteneur_actif"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.general.mode_conteneur_actif1': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) +optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01auto_jinja_full_path/tiramisu/multi.py b/tests/dictionaries/01auto_jinja_full_path/tiramisu/multi.py new file mode 100644 index 000000000..1603627ec --- /dev/null +++ b/tests/dictionaries/01auto_jinja_full_path/tiramisu/multi.py @@ -0,0 +1,67 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['1.rougail.general.mode_conteneur_actif'] = "{{ rougail.general.mode_conteneur_actif1 }}" +dict_env['2.rougail.general.mode_conteneur_actif'] = "{{ rougail.general.mode_conteneur_actif1 }}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) +option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("1.rougail.general.mode_conteneur_actif"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.general.mode_conteneur_actif1': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) +optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) +option_6 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) +option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("2.rougail.general.mode_conteneur_actif"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.general.mode_conteneur_actif1': ParamOption(option_6)})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) +optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) +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/01auto_jinja_full_path/xml/00-base.xml b/tests/dictionaries/01auto_jinja_full_path/xml/00-base.xml new file mode 100644 index 000000000..30112ff77 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_full_path/xml/00-base.xml @@ -0,0 +1,18 @@ + + + + + + + non + + + + + + mode_conteneur_actif + + + diff --git a/tests/dictionaries/01auto_jinja_full_path/yml/00-base.yml b/tests/dictionaries/01auto_jinja_full_path/yml/00-base.yml new file mode 100644 index 000000000..38d55fe60 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_full_path/yml/00-base.yml @@ -0,0 +1,23 @@ +version: '0.10' +variables: +- family: + - name: general + variables: + - variable: + - name: mode_conteneur_actif + type: string + description: No change + hidden: true + value: + - text: non + - name: mode_conteneur_actif1 + type: string + description: No change + value: + - text: non +constraints: +- fill: + - name: '{{ rougail.general.mode_conteneur_actif1 }}' + type: jinja + target: + - text: mode_conteneur_actif diff --git a/tests/dictionaries/01auto_jinja_if/__init__.py b/tests/dictionaries/01auto_jinja_if/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/01auto_jinja_if/makedict/after.json b/tests/dictionaries/01auto_jinja_if/makedict/after.json new file mode 100644 index 000000000..b9d4ee936 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if/makedict/after.json @@ -0,0 +1,14 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + }, + "rougail.general.mode_conteneur_actif1": { + "owner": "default", + "value": "non" + }, + "rougail.general.mode_conteneur_actif2": { + "owner": "default", + "value": "oui" + } +} diff --git a/tests/dictionaries/01auto_jinja_if/makedict/base.json b/tests/dictionaries/01auto_jinja_if/makedict/base.json new file mode 100644 index 000000000..4eee7b615 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if/makedict/base.json @@ -0,0 +1,5 @@ +{ + "rougail.general.mode_conteneur_actif": "non", + "rougail.general.mode_conteneur_actif1": "non", + "rougail.general.mode_conteneur_actif2": "oui" +} diff --git a/tests/dictionaries/01auto_jinja_if/makedict/before.json b/tests/dictionaries/01auto_jinja_if/makedict/before.json new file mode 100644 index 000000000..b9d4ee936 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if/makedict/before.json @@ -0,0 +1,14 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + }, + "rougail.general.mode_conteneur_actif1": { + "owner": "default", + "value": "non" + }, + "rougail.general.mode_conteneur_actif2": { + "owner": "default", + "value": "oui" + } +} diff --git a/tests/dictionaries/01auto_jinja_if/tiramisu/base.py b/tests/dictionaries/01auto_jinja_if/tiramisu/base.py new file mode 100644 index 000000000..e056854e2 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if/tiramisu/base.py @@ -0,0 +1,62 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['rougail.general.mode_conteneur_actif'] = "{% if mode_conteneur_actif1 == 'non' %}non{% else %}oui{% endif %}" +dict_env['rougail.general.mode_conteneur_actif2'] = "{% if mode_conteneur_actif1 == \"non\" %}oui{% else %}non{% endif %}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) +option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("rougail.general.mode_conteneur_actif"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'mode_conteneur_actif1': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("rougail.general.mode_conteneur_actif2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'mode_conteneur_actif1': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "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], properties=frozenset({"normal"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/01auto_jinja_if/tiramisu/multi.py b/tests/dictionaries/01auto_jinja_if/tiramisu/multi.py new file mode 100644 index 000000000..0d2dae7b7 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if/tiramisu/multi.py @@ -0,0 +1,71 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['1.rougail.general.mode_conteneur_actif'] = "{% if mode_conteneur_actif1 == 'non' %}non{% else %}oui{% endif %}" +dict_env['1.rougail.general.mode_conteneur_actif2'] = "{% if mode_conteneur_actif1 == \"non\" %}oui{% else %}non{% endif %}" +dict_env['2.rougail.general.mode_conteneur_actif'] = "{% if mode_conteneur_actif1 == 'non' %}non{% else %}oui{% endif %}" +dict_env['2.rougail.general.mode_conteneur_actif2'] = "{% if mode_conteneur_actif1 == \"non\" %}oui{% else %}non{% endif %}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) +option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("1.rougail.general.mode_conteneur_actif"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'mode_conteneur_actif1': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) +option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("1.rougail.general.mode_conteneur_actif2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'mode_conteneur_actif1': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "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], properties=frozenset({"normal"})) +optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) +option_7 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) +option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("2.rougail.general.mode_conteneur_actif"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'mode_conteneur_actif1': ParamOption(option_7)})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) +option_8 = StrOption(name="mode_conteneur_actif2", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("2.rougail.general.mode_conteneur_actif2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'mode_conteneur_actif1': ParamOption(option_7)})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "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], properties=frozenset({"normal"})) +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/01auto_jinja_if/xml/00-base.xml b/tests/dictionaries/01auto_jinja_if/xml/00-base.xml new file mode 100644 index 000000000..5e52c060c --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if/xml/00-base.xml @@ -0,0 +1,20 @@ + + + + + + + + + mode_conteneur_actif + + + mode_conteneur_actif2 + + + diff --git a/tests/dictionaries/01auto_jinja_if/yml/00-base.yml b/tests/dictionaries/01auto_jinja_if/yml/00-base.yml new file mode 100644 index 000000000..8076a61b9 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if/yml/00-base.yml @@ -0,0 +1,29 @@ +version: '0.10' +variables: +- family: + - name: general + variables: + - variable: + - name: mode_conteneur_actif + type: string + description: No change + hidden: true + - name: mode_conteneur_actif1 + type: string + description: No change + value: + - text: non + - name: mode_conteneur_actif2 + type: string + description: No change + hidden: true +constraints: +- fill: + - name: '{% if mode_conteneur_actif1 == ''non'' %}non{% else %}oui{% endif %}' + type: jinja + target: + - text: mode_conteneur_actif + - name: '{% if mode_conteneur_actif1 == "non" %}oui{% else %}non{% endif %}' + type: jinja + target: + - text: mode_conteneur_actif2 diff --git a/tests/dictionaries/01auto_jinja_if_bool/__init__.py b/tests/dictionaries/01auto_jinja_if_bool/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/01auto_jinja_if_bool/makedict/after.json b/tests/dictionaries/01auto_jinja_if_bool/makedict/after.json new file mode 100644 index 000000000..41001df3b --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_bool/makedict/after.json @@ -0,0 +1,19 @@ +{ + "rougail.general.bool": { + "owner": "default", + "value": true + }, + "rougail.general.multi1": { + "owner": "default", + "value": [ + true, + false + ] + }, + "rougail.general.multi2": { + "owner": "default", + "value": [ + false + ] + } +} diff --git a/tests/dictionaries/01auto_jinja_if_bool/makedict/base.json b/tests/dictionaries/01auto_jinja_if_bool/makedict/base.json new file mode 100644 index 000000000..5ac1abd6f --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_bool/makedict/base.json @@ -0,0 +1,10 @@ +{ + "rougail.general.bool": true, + "rougail.general.multi1": [ + true, + false + ], + "rougail.general.multi2": [ + false + ] +} diff --git a/tests/dictionaries/01auto_jinja_if_bool/makedict/before.json b/tests/dictionaries/01auto_jinja_if_bool/makedict/before.json new file mode 100644 index 000000000..41001df3b --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_bool/makedict/before.json @@ -0,0 +1,19 @@ +{ + "rougail.general.bool": { + "owner": "default", + "value": true + }, + "rougail.general.multi1": { + "owner": "default", + "value": [ + true, + false + ] + }, + "rougail.general.multi2": { + "owner": "default", + "value": [ + false + ] + } +} diff --git a/tests/dictionaries/01auto_jinja_if_bool/tiramisu/base.py b/tests/dictionaries/01auto_jinja_if_bool/tiramisu/base.py new file mode 100644 index 000000000..ebe8a38f5 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_bool/tiramisu/base.py @@ -0,0 +1,62 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['rougail.general.multi1'] = "{% if bool %}True,False{% else %}False{% endif %}" +dict_env['rougail.general.multi2'] = "{% if not bool %}True,False{% else %}False{% endif %}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_2 = BoolOption(name="bool", doc="bool", default=True, properties=frozenset({"mandatory", "normal"})) +option_3 = BoolOption(name="multi1", doc="multi1", multi=True, default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("rougail.general.multi1"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), 'bool': ParamOption(option_2)})), properties=frozenset({"normal"})) +option_4 = BoolOption(name="multi2", doc="multi2", multi=True, default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("rougail.general.multi2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), 'bool': ParamOption(option_2)})), 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], properties=frozenset({"normal"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/01auto_jinja_if_bool/tiramisu/multi.py b/tests/dictionaries/01auto_jinja_if_bool/tiramisu/multi.py new file mode 100644 index 000000000..8322d6424 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_bool/tiramisu/multi.py @@ -0,0 +1,71 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['1.rougail.general.multi1'] = "{% if bool %}True,False{% else %}False{% endif %}" +dict_env['1.rougail.general.multi2'] = "{% if not bool %}True,False{% else %}False{% endif %}" +dict_env['2.rougail.general.multi1'] = "{% if bool %}True,False{% else %}False{% endif %}" +dict_env['2.rougail.general.multi2'] = "{% if not bool %}True,False{% else %}False{% endif %}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_2 = BoolOption(name="bool", doc="bool", default=True, properties=frozenset({"mandatory", "normal"})) +option_3 = BoolOption(name="multi1", doc="multi1", multi=True, default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("1.rougail.general.multi1"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), 'bool': ParamOption(option_2)})), properties=frozenset({"normal"})) +option_4 = BoolOption(name="multi2", doc="multi2", multi=True, default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("1.rougail.general.multi2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), 'bool': ParamOption(option_2)})), 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], properties=frozenset({"normal"})) +optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) +option_6 = BoolOption(name="bool", doc="bool", default=True, properties=frozenset({"mandatory", "normal"})) +option_7 = BoolOption(name="multi1", doc="multi1", multi=True, default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("2.rougail.general.multi1"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), 'bool': ParamOption(option_6)})), properties=frozenset({"normal"})) +option_8 = BoolOption(name="multi2", doc="multi2", multi=True, default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("2.rougail.general.multi2"), '__internal_type': ParamValue("boolean"), '__internal_multi': ParamValue(True), 'bool': ParamOption(option_6)})), 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], properties=frozenset({"normal"})) +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/01auto_jinja_if_bool/xml/00-base.xml b/tests/dictionaries/01auto_jinja_if_bool/xml/00-base.xml new file mode 100644 index 000000000..08f4810e2 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_bool/xml/00-base.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + multi1 + + + multi2 + + + diff --git a/tests/dictionaries/01auto_jinja_if_bool/yml/00-base.yml b/tests/dictionaries/01auto_jinja_if_bool/yml/00-base.yml new file mode 100644 index 000000000..6fb42761f --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_bool/yml/00-base.yml @@ -0,0 +1,24 @@ +version: '0.10' +variables: +- family: + - name: general + variables: + - variable: + - name: bool + type: boolean + - name: multi1 + type: boolean + multi: true + - name: multi2 + type: boolean + multi: true +constraints: +- fill: + - name: '{% if bool %}True,False{% else %}False{% endif %}' + type: jinja + target: + - text: multi1 + - name: '{% if not bool %}True,False{% else %}False{% endif %}' + type: jinja + target: + - text: multi2 diff --git a/tests/dictionaries/01auto_jinja_if_int/__init__.py b/tests/dictionaries/01auto_jinja_if_int/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/01auto_jinja_if_int/makedict/after.json b/tests/dictionaries/01auto_jinja_if_int/makedict/after.json new file mode 100644 index 000000000..5bff78440 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_int/makedict/after.json @@ -0,0 +1,14 @@ +{ + "rougail.bool": { + "owner": "default", + "value": true + }, + "rougail.int1": { + "owner": "default", + "value": 1 + }, + "rougail.int2": { + "owner": "default", + "value": 4 + } +} diff --git a/tests/dictionaries/01auto_jinja_if_int/makedict/base.json b/tests/dictionaries/01auto_jinja_if_int/makedict/base.json new file mode 100644 index 000000000..98bf4d8aa --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_int/makedict/base.json @@ -0,0 +1,5 @@ +{ + "rougail.bool": true, + "rougail.int1": 1, + "rougail.int2": 4 +} diff --git a/tests/dictionaries/01auto_jinja_if_int/makedict/before.json b/tests/dictionaries/01auto_jinja_if_int/makedict/before.json new file mode 100644 index 000000000..5bff78440 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_int/makedict/before.json @@ -0,0 +1,14 @@ +{ + "rougail.bool": { + "owner": "default", + "value": true + }, + "rougail.int1": { + "owner": "default", + "value": 1 + }, + "rougail.int2": { + "owner": "default", + "value": 4 + } +} diff --git a/tests/dictionaries/01auto_jinja_if_int/tiramisu/base.py b/tests/dictionaries/01auto_jinja_if_int/tiramisu/base.py new file mode 100644 index 000000000..d0b47e92a --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_int/tiramisu/base.py @@ -0,0 +1,61 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['rougail.int1'] = "{% if bool %}1{% else %}2{% endif %}" +dict_env['rougail.int2'] = "{% if not bool %}3{% else %}4{% endif %}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_1 = BoolOption(name="bool", doc="bool", default=True, properties=frozenset({"mandatory", "normal"})) +option_2 = IntOption(name="int1", doc="int1", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("rougail.int1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), 'bool': ParamOption(option_1)})), properties=frozenset({"normal"})) +option_3 = IntOption(name="int2", doc="int2", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("rougail.int2"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), 'bool': ParamOption(option_1)})), properties=frozenset({"normal"})) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3], properties=frozenset({"normal"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01auto_jinja_if_int/tiramisu/multi.py b/tests/dictionaries/01auto_jinja_if_int/tiramisu/multi.py new file mode 100644 index 000000000..922b4cf7a --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_int/tiramisu/multi.py @@ -0,0 +1,69 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['1.rougail.int1'] = "{% if bool %}1{% else %}2{% endif %}" +dict_env['1.rougail.int2'] = "{% if not bool %}3{% else %}4{% endif %}" +dict_env['2.rougail.int1'] = "{% if bool %}1{% else %}2{% endif %}" +dict_env['2.rougail.int2'] = "{% if not bool %}3{% else %}4{% endif %}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_1 = BoolOption(name="bool", doc="bool", default=True, properties=frozenset({"mandatory", "normal"})) +option_2 = IntOption(name="int1", doc="int1", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("1.rougail.int1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), 'bool': ParamOption(option_1)})), properties=frozenset({"normal"})) +option_3 = IntOption(name="int2", doc="int2", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("1.rougail.int2"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), 'bool': ParamOption(option_1)})), properties=frozenset({"normal"})) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3], properties=frozenset({"normal"})) +optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) +option_4 = BoolOption(name="bool", doc="bool", default=True, properties=frozenset({"mandatory", "normal"})) +option_5 = IntOption(name="int1", doc="int1", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("2.rougail.int1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), 'bool': ParamOption(option_4)})), properties=frozenset({"normal"})) +option_6 = IntOption(name="int2", doc="int2", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("2.rougail.int2"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), 'bool': ParamOption(option_4)})), properties=frozenset({"normal"})) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) +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/01auto_jinja_if_int/xml/00-base.xml b/tests/dictionaries/01auto_jinja_if_int/xml/00-base.xml new file mode 100644 index 000000000..6d46923c7 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_int/xml/00-base.xml @@ -0,0 +1,16 @@ + + + + + + + + + + int1 + + + int2 + + + diff --git a/tests/dictionaries/01auto_jinja_if_int/yml/00-base.yml b/tests/dictionaries/01auto_jinja_if_int/yml/00-base.yml new file mode 100644 index 000000000..671161856 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_if_int/yml/00-base.yml @@ -0,0 +1,19 @@ +version: '0.10' +variables: +- variable: + - name: bool + type: boolean + - name: int1 + type: number + - name: int2 + type: number +constraints: +- fill: + - name: '{% if bool %}1{% else %}2{% endif %}' + type: jinja + target: + - text: int1 + - name: '{% if not bool %}3{% else %}4{% endif %}' + type: jinja + target: + - text: int2 diff --git a/tests/dictionaries/01auto_jinja_set/__init__.py b/tests/dictionaries/01auto_jinja_set/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/01auto_jinja_set/makedict/after.json b/tests/dictionaries/01auto_jinja_set/makedict/after.json new file mode 100644 index 000000000..5bff78440 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_set/makedict/after.json @@ -0,0 +1,14 @@ +{ + "rougail.bool": { + "owner": "default", + "value": true + }, + "rougail.int1": { + "owner": "default", + "value": 1 + }, + "rougail.int2": { + "owner": "default", + "value": 4 + } +} diff --git a/tests/dictionaries/01auto_jinja_set/makedict/base.json b/tests/dictionaries/01auto_jinja_set/makedict/base.json new file mode 100644 index 000000000..98bf4d8aa --- /dev/null +++ b/tests/dictionaries/01auto_jinja_set/makedict/base.json @@ -0,0 +1,5 @@ +{ + "rougail.bool": true, + "rougail.int1": 1, + "rougail.int2": 4 +} diff --git a/tests/dictionaries/01auto_jinja_set/makedict/before.json b/tests/dictionaries/01auto_jinja_set/makedict/before.json new file mode 100644 index 000000000..5bff78440 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_set/makedict/before.json @@ -0,0 +1,14 @@ +{ + "rougail.bool": { + "owner": "default", + "value": true + }, + "rougail.int1": { + "owner": "default", + "value": 1 + }, + "rougail.int2": { + "owner": "default", + "value": 4 + } +} diff --git a/tests/dictionaries/01auto_jinja_set/tiramisu/base.py b/tests/dictionaries/01auto_jinja_set/tiramisu/base.py new file mode 100644 index 000000000..2054fb205 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_set/tiramisu/base.py @@ -0,0 +1,61 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['rougail.int1'] = "{%set bool1 = bool %}{% if bool1 %}1{% else %}2{% endif %}" +dict_env['rougail.int2'] = "{%set bool1 = bool %}{% if not bool1 %}3{% else %}4{% endif %}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_1 = BoolOption(name="bool", doc="bool", default=True, properties=frozenset({"mandatory", "normal"})) +option_2 = IntOption(name="int1", doc="int1", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("rougail.int1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), 'bool': ParamOption(option_1)})), properties=frozenset({"normal"})) +option_3 = IntOption(name="int2", doc="int2", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("rougail.int2"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), 'bool': ParamOption(option_1)})), properties=frozenset({"normal"})) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3], properties=frozenset({"normal"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01auto_jinja_set/tiramisu/multi.py b/tests/dictionaries/01auto_jinja_set/tiramisu/multi.py new file mode 100644 index 000000000..bc38c3da1 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_set/tiramisu/multi.py @@ -0,0 +1,69 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['1.rougail.int1'] = "{%set bool1 = bool %}{% if bool1 %}1{% else %}2{% endif %}" +dict_env['1.rougail.int2'] = "{%set bool1 = bool %}{% if not bool1 %}3{% else %}4{% endif %}" +dict_env['2.rougail.int1'] = "{%set bool1 = bool %}{% if bool1 %}1{% else %}2{% endif %}" +dict_env['2.rougail.int2'] = "{%set bool1 = bool %}{% if not bool1 %}3{% else %}4{% endif %}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_1 = BoolOption(name="bool", doc="bool", default=True, properties=frozenset({"mandatory", "normal"})) +option_2 = IntOption(name="int1", doc="int1", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("1.rougail.int1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), 'bool': ParamOption(option_1)})), properties=frozenset({"normal"})) +option_3 = IntOption(name="int2", doc="int2", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("1.rougail.int2"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), 'bool': ParamOption(option_1)})), properties=frozenset({"normal"})) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3], properties=frozenset({"normal"})) +optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) +option_4 = BoolOption(name="bool", doc="bool", default=True, properties=frozenset({"mandatory", "normal"})) +option_5 = IntOption(name="int1", doc="int1", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("2.rougail.int1"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), 'bool': ParamOption(option_4)})), properties=frozenset({"normal"})) +option_6 = IntOption(name="int2", doc="int2", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("2.rougail.int2"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(False), 'bool': ParamOption(option_4)})), properties=frozenset({"normal"})) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) +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/01auto_jinja_set/xml/00-base.xml b/tests/dictionaries/01auto_jinja_set/xml/00-base.xml new file mode 100644 index 000000000..f9fe91807 --- /dev/null +++ b/tests/dictionaries/01auto_jinja_set/xml/00-base.xml @@ -0,0 +1,16 @@ + + + + + + + + + + int1 + + + int2 + + + diff --git a/tests/dictionaries/01auto_jinja_set/yml/00-base.yml b/tests/dictionaries/01auto_jinja_set/yml/00-base.yml new file mode 100644 index 000000000..f03546fbe --- /dev/null +++ b/tests/dictionaries/01auto_jinja_set/yml/00-base.yml @@ -0,0 +1,19 @@ +version: '0.10' +variables: +- variable: + - name: bool + type: boolean + - name: int1 + type: number + - name: int2 + type: number +constraints: +- fill: + - name: '{%set bool1 = bool %}{% if bool1 %}1{% else %}2{% endif %}' + type: jinja + target: + - text: int1 + - name: '{%set bool1 = bool %}{% if not bool1 %}3{% else %}4{% endif %}' + type: jinja + target: + - text: int2 diff --git a/tests/dictionaries/01auto_withoutparam/tiramisu/base.py b/tests/dictionaries/01auto_withoutparam/tiramisu/base.py index aa75e3138..0b341cc62 100644 --- a/tests/dictionaries/01auto_withoutparam/tiramisu/base.py +++ b/tests/dictionaries/01auto_withoutparam/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params(())), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01auto_withoutparam/tiramisu/multi.py b/tests/dictionaries/01auto_withoutparam/tiramisu/multi.py index 6004b88ac..0c3fd0336 100644 --- a/tests/dictionaries/01auto_withoutparam/tiramisu/multi.py +++ b/tests/dictionaries/01auto_withoutparam/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params(())), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params(())), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) option_6 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/01base_certificate_owner/tiramisu/base.py b/tests/dictionaries/01base_certificate_owner/tiramisu/base.py index 510b89cc8..c5a1cb034 100644 --- a/tests/dictionaries/01base_certificate_owner/tiramisu/base.py +++ b/tests/dictionaries/01base_certificate_owner/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_6 = SymLinkOption(name="domain", opt=option_1) option_7 = StrOption(name="name", doc="name", default="certificate") option_8 = UsernameOption(name="owner", doc="owner", default="example") diff --git a/tests/dictionaries/01base_certificate_owner/tiramisu/multi.py b/tests/dictionaries/01base_certificate_owner/tiramisu/multi.py index 0ddd3dbd9..9d5dee3fc 100644 --- a/tests/dictionaries/01base_certificate_owner/tiramisu/multi.py +++ b/tests/dictionaries/01base_certificate_owner/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="domain", opt=option_1) option_8 = StrOption(name="name", doc="name", default="certificate") option_9 = UsernameOption(name="owner", doc="owner", default="example") @@ -36,7 +41,7 @@ optiondescription_22.impl_set_information('type', "service") optiondescription_21 = OptionDescription(name="services", doc="services", children=[optiondescription_22], properties=frozenset({"hidden"})) optiondescription_19 = OptionDescription(name="1", doc="1", children=[optiondescription_20, optiondescription_21]) option_2 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) option_15 = SymLinkOption(name="domain", opt=option_2) option_16 = StrOption(name="name", doc="name", default="certificate") option_17 = UsernameOption(name="owner", doc="owner", default="example") diff --git a/tests/dictionaries/01base_certificate_owner_variable/tiramisu/base.py b/tests/dictionaries/01base_certificate_owner_variable/tiramisu/base.py index 26b43e570..3ea321e46 100644 --- a/tests/dictionaries/01base_certificate_owner_variable/tiramisu/base.py +++ b/tests/dictionaries/01base_certificate_owner_variable/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = UsernameOption(name="owner", doc="owner", default="example", properties=frozenset({"mandatory", "normal"})) option_2 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) -optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="domain", opt=option_2) option_8 = StrOption(name="name", doc="name", default="certificate") option_9 = SymLinkOption(name="owner", opt=option_1) diff --git a/tests/dictionaries/01base_certificate_owner_variable/tiramisu/multi.py b/tests/dictionaries/01base_certificate_owner_variable/tiramisu/multi.py index 9ed8b6e78..a13984ff9 100644 --- a/tests/dictionaries/01base_certificate_owner_variable/tiramisu/multi.py +++ b/tests/dictionaries/01base_certificate_owner_variable/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = UsernameOption(name="owner", doc="owner", default="example", properties=frozenset({"mandatory", "normal"})) option_2 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) -optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_9 = SymLinkOption(name="domain", opt=option_2) option_10 = StrOption(name="name", doc="name", default="certificate") option_11 = SymLinkOption(name="owner", opt=option_1) @@ -38,7 +43,7 @@ optiondescription_23 = OptionDescription(name="services", doc="services", childr optiondescription_21 = OptionDescription(name="1", doc="1", children=[optiondescription_22, optiondescription_23]) option_3 = UsernameOption(name="owner", doc="owner", default="example", properties=frozenset({"mandatory", "normal"})) option_4 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) -optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"normal"})) option_17 = SymLinkOption(name="domain", opt=option_4) option_18 = StrOption(name="name", doc="name", default="certificate") option_19 = SymLinkOption(name="owner", opt=option_3) diff --git a/tests/dictionaries/01base_domainname/tiramisu/base.py b/tests/dictionaries/01base_domainname/tiramisu/base.py index 0f5d4f1fa..6b6ac0fa9 100644 --- a/tests/dictionaries/01base_domainname/tiramisu/base.py +++ b/tests/dictionaries/01base_domainname/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = DomainnameOption(name="domain", doc="Description", default="my.domain.name", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01base_domainname/tiramisu/multi.py b/tests/dictionaries/01base_domainname/tiramisu/multi.py index 0fd047282..45bebd723 100644 --- a/tests/dictionaries/01base_domainname/tiramisu/multi.py +++ b/tests/dictionaries/01base_domainname/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = DomainnameOption(name="domain", doc="Description", default="my.domain.name", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = DomainnameOption(name="domain", doc="Description", default="my.domain.name", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01base_file/tiramisu/base.py b/tests/dictionaries/01base_file/tiramisu/base.py index 9614a4563..b934bf782 100644 --- a/tests/dictionaries/01base_file/tiramisu/base.py +++ b/tests/dictionaries/01base_file/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/file") option_8 = StrOption(name="source", doc="source", default="file") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file/tiramisu/multi.py b/tests/dictionaries/01base_file/tiramisu/multi.py index bee8da664..7fa6ccb4d 100644 --- a/tests/dictionaries/01base_file/tiramisu/multi.py +++ b/tests/dictionaries/01base_file/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -39,7 +44,7 @@ optiondescription_29 = OptionDescription(name="services", doc="services", childr optiondescription_27 = OptionDescription(name="1", doc="1", children=[optiondescription_28, optiondescription_29]) option_4 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/etc/file") option_21 = StrOption(name="source", doc="source", default="file") option_19 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_disabled/tiramisu/base.py b/tests/dictionaries/01base_file_disabled/tiramisu/base.py index 56d95ae87..092f40d39 100644 --- a/tests/dictionaries/01base_file_disabled/tiramisu/base.py +++ b/tests/dictionaries/01base_file_disabled/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/file") option_8 = StrOption(name="source", doc="source", default="file") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_disabled/tiramisu/multi.py b/tests/dictionaries/01base_file_disabled/tiramisu/multi.py index 789da465c..6ab338bd5 100644 --- a/tests/dictionaries/01base_file_disabled/tiramisu/multi.py +++ b/tests/dictionaries/01base_file_disabled/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -43,7 +48,7 @@ optiondescription_37 = OptionDescription(name="services", doc="services", childr optiondescription_35 = OptionDescription(name="1", doc="1", children=[optiondescription_36, optiondescription_37]) option_4 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_40 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_40 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_24 = FilenameOption(name="name", doc="name", default="/etc/file") option_25 = StrOption(name="source", doc="source", default="file") option_23 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_include/tiramisu/base.py b/tests/dictionaries/01base_file_include/tiramisu/base.py index 9614a4563..b934bf782 100644 --- a/tests/dictionaries/01base_file_include/tiramisu/base.py +++ b/tests/dictionaries/01base_file_include/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/file") option_8 = StrOption(name="source", doc="source", default="file") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_include/tiramisu/multi.py b/tests/dictionaries/01base_file_include/tiramisu/multi.py index bee8da664..7fa6ccb4d 100644 --- a/tests/dictionaries/01base_file_include/tiramisu/multi.py +++ b/tests/dictionaries/01base_file_include/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -39,7 +44,7 @@ optiondescription_29 = OptionDescription(name="services", doc="services", childr optiondescription_27 = OptionDescription(name="1", doc="1", children=[optiondescription_28, optiondescription_29]) option_4 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/etc/file") option_21 = StrOption(name="source", doc="source", default="file") option_19 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_include_content/tiramisu/base.py b/tests/dictionaries/01base_file_include_content/tiramisu/base.py index 5460ada05..70d306b89 100644 --- a/tests/dictionaries/01base_file_include_content/tiramisu/base.py +++ b/tests/dictionaries/01base_file_include_content/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/file") option_8 = StrOption(name="source", doc="source", default="file") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_include_content/tiramisu/multi.py b/tests/dictionaries/01base_file_include_content/tiramisu/multi.py index 2f6d37124..44437fbeb 100644 --- a/tests/dictionaries/01base_file_include_content/tiramisu/multi.py +++ b/tests/dictionaries/01base_file_include_content/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -44,7 +49,7 @@ optiondescription_37 = OptionDescription(name="services", doc="services", childr optiondescription_35 = OptionDescription(name="1", doc="1", children=[optiondescription_36, optiondescription_37]) option_4 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_40 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_40 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_24 = FilenameOption(name="name", doc="name", default="/etc/file") option_25 = StrOption(name="source", doc="source", default="file") option_23 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_include_name/tiramisu/base.py b/tests/dictionaries/01base_file_include_name/tiramisu/base.py index ea6abb1f6..407c37c33 100644 --- a/tests/dictionaries/01base_file_include_name/tiramisu/base.py +++ b/tests/dictionaries/01base_file_include_name/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/file") option_8 = StrOption(name="source", doc="source", default="file") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_include_name/tiramisu/multi.py b/tests/dictionaries/01base_file_include_name/tiramisu/multi.py index 4e43ceca4..f3dceb5c8 100644 --- a/tests/dictionaries/01base_file_include_name/tiramisu/multi.py +++ b/tests/dictionaries/01base_file_include_name/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -44,7 +49,7 @@ optiondescription_37 = OptionDescription(name="services", doc="services", childr optiondescription_35 = OptionDescription(name="1", doc="1", children=[optiondescription_36, optiondescription_37]) option_4 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_40 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_40 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_24 = FilenameOption(name="name", doc="name", default="/etc/file") option_25 = StrOption(name="source", doc="source", default="file") option_23 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_mode/tiramisu/base.py b/tests/dictionaries/01base_file_mode/tiramisu/base.py index 9892938ac..cb670dbfc 100644 --- a/tests/dictionaries/01base_file_mode/tiramisu/base.py +++ b/tests/dictionaries/01base_file_mode/tiramisu/base.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_5 = FilenameOption(name="name", doc="name", default="/etc/file") option_6 = StrOption(name="source", doc="source", default="file") option_4 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_mode/tiramisu/multi.py b/tests/dictionaries/01base_file_mode/tiramisu/multi.py index 348c2244c..9471fef59 100644 --- a/tests/dictionaries/01base_file_mode/tiramisu/multi.py +++ b/tests/dictionaries/01base_file_mode/tiramisu/multi.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_5 = FilenameOption(name="name", doc="name", default="/etc/file") option_6 = StrOption(name="source", doc="source", default="file") option_4 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_mode2/tiramisu/base.py b/tests/dictionaries/01base_file_mode2/tiramisu/base.py index fb3fee513..71b93b0d0 100644 --- a/tests/dictionaries/01base_file_mode2/tiramisu/base.py +++ b/tests/dictionaries/01base_file_mode2/tiramisu/base.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_5 = FilenameOption(name="name", doc="name", default="/etc/file") option_6 = StrOption(name="source", doc="source", default="file") option_4 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_mode2/tiramisu/multi.py b/tests/dictionaries/01base_file_mode2/tiramisu/multi.py index bb040661b..a0b04ff37 100644 --- a/tests/dictionaries/01base_file_mode2/tiramisu/multi.py +++ b/tests/dictionaries/01base_file_mode2/tiramisu/multi.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_5 = FilenameOption(name="name", doc="name", default="/etc/file") option_6 = StrOption(name="source", doc="source", default="file") option_4 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_owner/tiramisu/base.py b/tests/dictionaries/01base_file_owner/tiramisu/base.py index 0dd9873b0..4506d9319 100644 --- a/tests/dictionaries/01base_file_owner/tiramisu/base.py +++ b/tests/dictionaries/01base_file_owner/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = UsernameOption(name="group", doc="group", default="nobody") option_8 = FilenameOption(name="name", doc="name", default="/etc/file") option_9 = UsernameOption(name="owner", doc="owner", default="nobody") diff --git a/tests/dictionaries/01base_file_owner/tiramisu/multi.py b/tests/dictionaries/01base_file_owner/tiramisu/multi.py index 38caf5a6f..792df183a 100644 --- a/tests/dictionaries/01base_file_owner/tiramisu/multi.py +++ b/tests/dictionaries/01base_file_owner/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = UsernameOption(name="group", doc="group", default="nobody") option_10 = FilenameOption(name="name", doc="name", default="/etc/file") option_11 = UsernameOption(name="owner", doc="owner", default="nobody") @@ -43,7 +48,7 @@ optiondescription_37 = OptionDescription(name="services", doc="services", childr optiondescription_35 = OptionDescription(name="1", doc="1", children=[optiondescription_36, optiondescription_37]) option_4 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_40 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_40 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_24 = UsernameOption(name="group", doc="group", default="nobody") option_25 = FilenameOption(name="name", doc="name", default="/etc/file") option_26 = UsernameOption(name="owner", doc="owner", default="nobody") diff --git a/tests/dictionaries/01base_file_owner_variable/tiramisu/base.py b/tests/dictionaries/01base_file_owner_variable/tiramisu/base.py index b502c2381..3c0883ddf 100644 --- a/tests/dictionaries/01base_file_owner_variable/tiramisu/base.py +++ b/tests/dictionaries/01base_file_owner_variable/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = UsernameOption(name="owner", doc="owner", default="nobody", properties=frozenset({"mandatory", "normal"})) option_4 = UsernameOption(name="group", doc="group", default="nobody", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = SymLinkOption(name="group", opt=option_4) option_10 = FilenameOption(name="name", doc="name", default="/etc/file") option_11 = SymLinkOption(name="owner", opt=option_3) diff --git a/tests/dictionaries/01base_file_owner_variable/tiramisu/multi.py b/tests/dictionaries/01base_file_owner_variable/tiramisu/multi.py index cd1709ec5..ee667d7ae 100644 --- a/tests/dictionaries/01base_file_owner_variable/tiramisu/multi.py +++ b/tests/dictionaries/01base_file_owner_variable/tiramisu/multi.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = UsernameOption(name="owner", doc="owner", default="nobody", properties=frozenset({"mandatory", "normal"})) option_4 = UsernameOption(name="group", doc="group", default="nobody", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_40 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_40 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = SymLinkOption(name="group", opt=option_4) option_14 = FilenameOption(name="name", doc="name", default="/etc/file") option_15 = SymLinkOption(name="owner", opt=option_3) @@ -47,7 +52,7 @@ option_6 = StrOption(name="mode_conteneur_actif", doc="Description", default="no option_7 = UsernameOption(name="owner", doc="owner", default="nobody", properties=frozenset({"mandatory", "normal"})) option_8 = UsernameOption(name="group", doc="group", default="nobody", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) -optiondescription_44 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_44 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_28 = SymLinkOption(name="group", opt=option_8) option_29 = FilenameOption(name="name", doc="name", default="/etc/file") option_30 = SymLinkOption(name="owner", opt=option_7) diff --git a/tests/dictionaries/01base_file_patch/tiramisu/base.py b/tests/dictionaries/01base_file_patch/tiramisu/base.py index 9614a4563..b934bf782 100644 --- a/tests/dictionaries/01base_file_patch/tiramisu/base.py +++ b/tests/dictionaries/01base_file_patch/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/file") option_8 = StrOption(name="source", doc="source", default="file") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_patch/tiramisu/multi.py b/tests/dictionaries/01base_file_patch/tiramisu/multi.py index bee8da664..7fa6ccb4d 100644 --- a/tests/dictionaries/01base_file_patch/tiramisu/multi.py +++ b/tests/dictionaries/01base_file_patch/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -39,7 +44,7 @@ optiondescription_29 = OptionDescription(name="services", doc="services", childr optiondescription_27 = OptionDescription(name="1", doc="1", children=[optiondescription_28, optiondescription_29]) option_4 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/etc/file") option_21 = StrOption(name="source", doc="source", default="file") option_19 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_tmpfiles_delete_before_create/tiramisu/base.py b/tests/dictionaries/01base_file_tmpfiles_delete_before_create/tiramisu/base.py index 9614a4563..b934bf782 100644 --- a/tests/dictionaries/01base_file_tmpfiles_delete_before_create/tiramisu/base.py +++ b/tests/dictionaries/01base_file_tmpfiles_delete_before_create/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/file") option_8 = StrOption(name="source", doc="source", default="file") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_tmpfiles_delete_before_create/tiramisu/multi.py b/tests/dictionaries/01base_file_tmpfiles_delete_before_create/tiramisu/multi.py index bee8da664..7fa6ccb4d 100644 --- a/tests/dictionaries/01base_file_tmpfiles_delete_before_create/tiramisu/multi.py +++ b/tests/dictionaries/01base_file_tmpfiles_delete_before_create/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -39,7 +44,7 @@ optiondescription_29 = OptionDescription(name="services", doc="services", childr optiondescription_27 = OptionDescription(name="1", doc="1", children=[optiondescription_28, optiondescription_29]) option_4 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/etc/file") option_21 = StrOption(name="source", doc="source", default="file") option_19 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_tmpfiles_factory_dir/tiramisu/base.py b/tests/dictionaries/01base_file_tmpfiles_factory_dir/tiramisu/base.py index 9614a4563..b934bf782 100644 --- a/tests/dictionaries/01base_file_tmpfiles_factory_dir/tiramisu/base.py +++ b/tests/dictionaries/01base_file_tmpfiles_factory_dir/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/file") option_8 = StrOption(name="source", doc="source", default="file") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_tmpfiles_factory_dir/tiramisu/multi.py b/tests/dictionaries/01base_file_tmpfiles_factory_dir/tiramisu/multi.py index bee8da664..7fa6ccb4d 100644 --- a/tests/dictionaries/01base_file_tmpfiles_factory_dir/tiramisu/multi.py +++ b/tests/dictionaries/01base_file_tmpfiles_factory_dir/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -39,7 +44,7 @@ optiondescription_29 = OptionDescription(name="services", doc="services", childr optiondescription_27 = OptionDescription(name="1", doc="1", children=[optiondescription_28, optiondescription_29]) option_4 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/etc/file") option_21 = StrOption(name="source", doc="source", default="file") option_19 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_utfchar/tiramisu/base.py b/tests/dictionaries/01base_file_utfchar/tiramisu/base.py index ff40e0a89..cf8e18fdd 100644 --- a/tests/dictionaries/01base_file_utfchar/tiramisu/base.py +++ b/tests/dictionaries/01base_file_utfchar/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel") option_8 = StrOption(name="source", doc="source", default="systemd-makefs@dev-disk-by\\x2dpartlabel") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_utfchar/tiramisu/multi.py b/tests/dictionaries/01base_file_utfchar/tiramisu/multi.py index 6bcd6ea1e..e9f8b9e05 100644 --- a/tests/dictionaries/01base_file_utfchar/tiramisu/multi.py +++ b/tests/dictionaries/01base_file_utfchar/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel") option_10 = StrOption(name="source", doc="source", default="systemd-makefs@dev-disk-by\\x2dpartlabel") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -39,7 +44,7 @@ optiondescription_29 = OptionDescription(name="services", doc="services", childr optiondescription_27 = OptionDescription(name="1", doc="1", children=[optiondescription_28, optiondescription_29]) option_4 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel") option_21 = StrOption(name="source", doc="source", default="systemd-makefs@dev-disk-by\\x2dpartlabel") option_19 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_var_source/tiramisu/base.py b/tests/dictionaries/01base_file_var_source/tiramisu/base.py index 5cd332ef1..7c93ffffd 100644 --- a/tests/dictionaries/01base_file_var_source/tiramisu/base.py +++ b/tests/dictionaries/01base_file_var_source/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="source_var", doc="Description", default="file", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_8 = FilenameOption(name="name", doc="name", default="/etc/file") option_9 = SymLinkOption(name="source", opt=option_2) option_7 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_file_var_source/tiramisu/multi.py b/tests/dictionaries/01base_file_var_source/tiramisu/multi.py index 7ae267c57..b850cea04 100644 --- a/tests/dictionaries/01base_file_var_source/tiramisu/multi.py +++ b/tests/dictionaries/01base_file_var_source/tiramisu/multi.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="source_var", doc="Description", default="file", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_11 = FilenameOption(name="name", doc="name", default="/etc/file") option_12 = SymLinkOption(name="source", opt=option_2) option_10 = BoolOption(name="activate", doc="activate", default=True) @@ -36,7 +41,7 @@ optiondescription_21 = OptionDescription(name="1", doc="1", children=[optiondesc option_5 = StrOption(name="source_var", doc="Description", default="file", properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) option_18 = FilenameOption(name="name", doc="name", default="/etc/file") option_19 = SymLinkOption(name="source", opt=option_5) option_17 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/01base_float/tiramisu/base.py b/tests/dictionaries/01base_float/tiramisu/base.py index 2460a91aa..e83ffa15f 100644 --- a/tests/dictionaries/01base_float/tiramisu/base.py +++ b/tests/dictionaries/01base_float/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"mandatory", "normal"})) option_3 = FloatOption(name="float_multi", doc="Description", multi=True, default=[0.527], default_multi=0.527, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01base_float/tiramisu/multi.py b/tests/dictionaries/01base_float/tiramisu/multi.py index 819e6f5af..6d87b4433 100644 --- a/tests/dictionaries/01base_float/tiramisu/multi.py +++ b/tests/dictionaries/01base_float/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"mandatory", "normal"})) option_3 = FloatOption(name="float_multi", doc="Description", multi=True, default=[0.527], default_multi=0.527, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"mandatory", "normal"})) option_6 = FloatOption(name="float_multi", doc="Description", multi=True, default=[0.527], default_multi=0.527, properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/01base_help_quote/tiramisu/base.py b/tests/dictionaries/01base_help_quote/tiramisu/base.py index c2d0cba78..9c00d87d4 100644 --- a/tests/dictionaries/01base_help_quote/tiramisu/base.py +++ b/tests/dictionaries/01base_help_quote/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", properties=frozenset({"normal"})) option_2.impl_set_information('help', "message with '") option_3 = StrOption(name="mode_conteneur_actif1", doc="Redefine description", properties=frozenset({"normal"})) option_3.impl_set_information('help', "message with \"") optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01base_help_quote/tiramisu/multi.py b/tests/dictionaries/01base_help_quote/tiramisu/multi.py index f2f7d3a13..1ca1981b0 100644 --- a/tests/dictionaries/01base_help_quote/tiramisu/multi.py +++ b/tests/dictionaries/01base_help_quote/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", properties=frozenset({"normal"})) option_2.impl_set_information('help', "message with '") option_3 = StrOption(name="mode_conteneur_actif1", doc="Redefine description", properties=frozenset({"normal"})) option_3.impl_set_information('help', "message with \"") optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="mode_conteneur_actif", doc="Redefine description", properties=frozenset({"normal"})) option_5.impl_set_information('help', "message with '") option_6 = StrOption(name="mode_conteneur_actif1", doc="Redefine description", properties=frozenset({"normal"})) option_6.impl_set_information('help', "message with \"") optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/01base_multi/tiramisu/base.py b/tests/dictionaries/01base_multi/tiramisu/base.py index c989bb60b..5fc55cc43 100644 --- a/tests/dictionaries/01base_multi/tiramisu/base.py +++ b/tests/dictionaries/01base_multi/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01base_multi/tiramisu/multi.py b/tests/dictionaries/01base_multi/tiramisu/multi.py index 30b49e21a..4b92ec1d2 100644 --- a/tests/dictionaries/01base_multi/tiramisu/multi.py +++ b/tests/dictionaries/01base_multi/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01base_multi_notuniq/tiramisu/base.py b/tests/dictionaries/01base_multi_notuniq/tiramisu/base.py index 7e614dfa6..50e6e5a2a 100644 --- a/tests/dictionaries/01base_multi_notuniq/tiramisu/base.py +++ b/tests/dictionaries/01base_multi_notuniq/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", "notunique"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01base_multi_notuniq/tiramisu/multi.py b/tests/dictionaries/01base_multi_notuniq/tiramisu/multi.py index 9670f7265..98b0fa649 100644 --- a/tests/dictionaries/01base_multi_notuniq/tiramisu/multi.py +++ b/tests/dictionaries/01base_multi_notuniq/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", "notunique"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", "notunique"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01base_multi_uniq/tiramisu/base.py b/tests/dictionaries/01base_multi_uniq/tiramisu/base.py index f906e3cb9..3f87d85db 100644 --- a/tests/dictionaries/01base_multi_uniq/tiramisu/base.py +++ b/tests/dictionaries/01base_multi_uniq/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", "unique"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01base_multi_uniq/tiramisu/multi.py b/tests/dictionaries/01base_multi_uniq/tiramisu/multi.py index 173f66257..7984527c6 100644 --- a/tests/dictionaries/01base_multi_uniq/tiramisu/multi.py +++ b/tests/dictionaries/01base_multi_uniq/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", "unique"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", "unique"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01base_provider/tiramisu/base.py b/tests/dictionaries/01base_provider/tiramisu/base.py index 25c2f00bb..b9d9dc2d0 100644 --- a/tests/dictionaries/01base_provider/tiramisu/base.py +++ b/tests/dictionaries/01base_provider/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"mandatory", "normal"})) option_3 = FloatOption(name="float_multi", doc="Description", multi=True, default=[0.527], default_multi=0.527, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) option_0.impl_set_information('provider:float', "rougail.general.float") diff --git a/tests/dictionaries/01base_provider/tiramisu/multi.py b/tests/dictionaries/01base_provider/tiramisu/multi.py index 83d16bcbd..d6dbb0e6d 100644 --- a/tests/dictionaries/01base_provider/tiramisu/multi.py +++ b/tests/dictionaries/01base_provider/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"mandatory", "normal"})) option_3 = FloatOption(name="float_multi", doc="Description", multi=True, default=[0.527], default_multi=0.527, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) optiondescription_7.impl_set_information('provider:float', "rougail.general.float") option_5 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"mandatory", "normal"})) option_6 = FloatOption(name="float_multi", doc="Description", multi=True, default=[0.527], default_multi=0.527, properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10]) optiondescription_9.impl_set_information('provider:float', "rougail.general.float") option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7, optiondescription_9]) diff --git a/tests/dictionaries/01base_provider_extra/tiramisu/base.py b/tests/dictionaries/01base_provider_extra/tiramisu/base.py index 6680d9a49..23a27108f 100644 --- a/tests/dictionaries/01base_provider_extra/tiramisu/base.py +++ b/tests/dictionaries/01base_provider_extra/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = FloatOption(name="float", doc="Description", properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_3 = StrOption(name="description", doc="description", properties=frozenset({"normal"})) optiondescription_2 = OptionDescription(name="example", doc="example", children=[option_3], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="extra", doc="extra", children=[optiondescription_2]) +optiondescription_5 = OptionDescription(name="extra", doc="extra", children=[optiondescription_2], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4, optiondescription_5]) option_0.impl_set_information('provider:example', "extra.example.description") diff --git a/tests/dictionaries/01base_provider_extra/tiramisu/multi.py b/tests/dictionaries/01base_provider_extra/tiramisu/multi.py index 9b83f8bbd..3865df3b0 100644 --- a/tests/dictionaries/01base_provider_extra/tiramisu/multi.py +++ b/tests/dictionaries/01base_provider_extra/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = FloatOption(name="float", doc="Description", properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_3 = StrOption(name="description", doc="description", properties=frozenset({"normal"})) optiondescription_2 = OptionDescription(name="example", doc="example", children=[option_3], properties=frozenset({"normal"})) -optiondescription_9 = OptionDescription(name="extra", doc="extra", children=[optiondescription_2]) +optiondescription_9 = OptionDescription(name="extra", doc="extra", children=[optiondescription_2], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8, optiondescription_9]) optiondescription_7.impl_set_information('provider:example', "extra.example.description") option_4 = FloatOption(name="float", doc="Description", properties=frozenset({"normal"})) -optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[option_4]) +optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[option_4], properties=frozenset({"normal"})) option_6 = StrOption(name="description", doc="description", properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="example", doc="example", children=[option_6], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="extra", doc="extra", children=[optiondescription_5]) +optiondescription_12 = OptionDescription(name="extra", doc="extra", children=[optiondescription_5], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="2", doc="2", children=[optiondescription_11, optiondescription_12]) optiondescription_10.impl_set_information('provider:example', "extra.example.description") option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7, optiondescription_10]) diff --git a/tests/dictionaries/01base_provider_hidden/tiramisu/base.py b/tests/dictionaries/01base_provider_hidden/tiramisu/base.py index 42c131bc0..622c1545c 100644 --- a/tests/dictionaries/01base_provider_hidden/tiramisu/base.py +++ b/tests/dictionaries/01base_provider_hidden/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"hidden", "mandatory", "normal"})) option_3 = FloatOption(name="float_multi", doc="Description", multi=True, default=[0.527], default_multi=0.527, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) option_0.impl_set_information('provider:float', "rougail.general.float") diff --git a/tests/dictionaries/01base_provider_hidden/tiramisu/multi.py b/tests/dictionaries/01base_provider_hidden/tiramisu/multi.py index 019b12cc7..051167ec8 100644 --- a/tests/dictionaries/01base_provider_hidden/tiramisu/multi.py +++ b/tests/dictionaries/01base_provider_hidden/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"hidden", "mandatory", "normal"})) option_3 = FloatOption(name="float_multi", doc="Description", multi=True, default=[0.527], default_multi=0.527, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) optiondescription_7.impl_set_information('provider:float', "rougail.general.float") option_5 = FloatOption(name="float", doc="Description", default=0.527, properties=frozenset({"hidden", "mandatory", "normal"})) option_6 = FloatOption(name="float_multi", doc="Description", multi=True, default=[0.527], default_multi=0.527, properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10]) optiondescription_9.impl_set_information('provider:float', "rougail.general.float") option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7, optiondescription_9]) diff --git a/tests/dictionaries/01base_value_doublequote/tiramisu/base.py b/tests/dictionaries/01base_value_doublequote/tiramisu/base.py index 159f67dbc..df6ffd962 100644 --- a/tests/dictionaries/01base_value_doublequote/tiramisu/base.py +++ b/tests/dictionaries/01base_value_doublequote/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01base_value_doublequote/tiramisu/multi.py b/tests/dictionaries/01base_value_doublequote/tiramisu/multi.py index d46813a56..4f866735a 100644 --- a/tests/dictionaries/01base_value_doublequote/tiramisu/multi.py +++ b/tests/dictionaries/01base_value_doublequote/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01base_value_doublequote2/tiramisu/base.py b/tests/dictionaries/01base_value_doublequote2/tiramisu/base.py index d4983eeaa..42756be93 100644 --- a/tests/dictionaries/01base_value_doublequote2/tiramisu/base.py +++ b/tests/dictionaries/01base_value_doublequote2/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote'\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01base_value_doublequote2/tiramisu/multi.py b/tests/dictionaries/01base_value_doublequote2/tiramisu/multi.py index ea980460f..5fefb986c 100644 --- a/tests/dictionaries/01base_value_doublequote2/tiramisu/multi.py +++ b/tests/dictionaries/01base_value_doublequote2/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote'\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote'\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01base_value_doublequote3/tiramisu/base.py b/tests/dictionaries/01base_value_doublequote3/tiramisu/base.py index c9ece82be..20261795e 100644 --- a/tests/dictionaries/01base_value_doublequote3/tiramisu/base.py +++ b/tests/dictionaries/01base_value_doublequote3/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote\\\"\\'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01base_value_doublequote3/tiramisu/multi.py b/tests/dictionaries/01base_value_doublequote3/tiramisu/multi.py index e5d79f60e..97fd85c73 100644 --- a/tests/dictionaries/01base_value_doublequote3/tiramisu/multi.py +++ b/tests/dictionaries/01base_value_doublequote3/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote\\\"\\'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote\\\"\\'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01base_value_multi_doublequote/tiramisu/base.py b/tests/dictionaries/01base_value_multi_doublequote/tiramisu/base.py index 52b154f50..765f76f35 100644 --- a/tests/dictionaries/01base_value_multi_doublequote/tiramisu/base.py +++ b/tests/dictionaries/01base_value_multi_doublequote/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['quote"'], default_multi="quote\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01base_value_multi_doublequote/tiramisu/multi.py b/tests/dictionaries/01base_value_multi_doublequote/tiramisu/multi.py index 90c69d62a..2f6fb0031 100644 --- a/tests/dictionaries/01base_value_multi_doublequote/tiramisu/multi.py +++ b/tests/dictionaries/01base_value_multi_doublequote/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['quote"'], default_multi="quote\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['quote"'], default_multi="quote\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01base_value_multi_doublequote2/tiramisu/base.py b/tests/dictionaries/01base_value_multi_doublequote2/tiramisu/base.py index 90f6d103f..8f298ac0b 100644 --- a/tests/dictionaries/01base_value_multi_doublequote2/tiramisu/base.py +++ b/tests/dictionaries/01base_value_multi_doublequote2/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['quote\'"'], default_multi="quote'\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01base_value_multi_doublequote2/tiramisu/multi.py b/tests/dictionaries/01base_value_multi_doublequote2/tiramisu/multi.py index 897669597..993e150d5 100644 --- a/tests/dictionaries/01base_value_multi_doublequote2/tiramisu/multi.py +++ b/tests/dictionaries/01base_value_multi_doublequote2/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['quote\'"'], default_multi="quote'\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['quote\'"'], default_multi="quote'\"", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01base_value_multi_quote/tiramisu/base.py b/tests/dictionaries/01base_value_multi_quote/tiramisu/base.py index 9a0800357..a2a169953 100644 --- a/tests/dictionaries/01base_value_multi_quote/tiramisu/base.py +++ b/tests/dictionaries/01base_value_multi_quote/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=["quote'"], default_multi="quote'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01base_value_multi_quote/tiramisu/multi.py b/tests/dictionaries/01base_value_multi_quote/tiramisu/multi.py index 6c061a8c1..4f660b8b5 100644 --- a/tests/dictionaries/01base_value_multi_quote/tiramisu/multi.py +++ b/tests/dictionaries/01base_value_multi_quote/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=["quote'"], default_multi="quote'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=["quote'"], default_multi="quote'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01base_value_quote/tiramisu/base.py b/tests/dictionaries/01base_value_quote/tiramisu/base.py index d583f79fc..16db27f31 100644 --- a/tests/dictionaries/01base_value_quote/tiramisu/base.py +++ b/tests/dictionaries/01base_value_quote/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01base_value_quote/tiramisu/multi.py b/tests/dictionaries/01base_value_quote/tiramisu/multi.py index f9a89b12a..0be7f55c8 100644 --- a/tests/dictionaries/01base_value_quote/tiramisu/multi.py +++ b/tests/dictionaries/01base_value_quote/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine description", default="quote'", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01base_var_name_same_family/tiramisu/base.py b/tests/dictionaries/01base_var_name_same_family/tiramisu/base.py index e3b448313..46049dc0a 100644 --- a/tests/dictionaries/01base_var_name_same_family/tiramisu/base.py +++ b/tests/dictionaries/01base_var_name_same_family/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="general", doc="description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01base_var_name_same_family/tiramisu/multi.py b/tests/dictionaries/01base_var_name_same_family/tiramisu/multi.py index 84a894e43..c57e08b13 100644 --- a/tests/dictionaries/01base_var_name_same_family/tiramisu/multi.py +++ b/tests/dictionaries/01base_var_name_same_family/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="general", doc="description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="general", doc="description", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01boolean_no_mandatory/tiramisu/base.py b/tests/dictionaries/01boolean_no_mandatory/tiramisu/base.py index d2cd2e1a1..bd39ff99d 100644 --- a/tests/dictionaries/01boolean_no_mandatory/tiramisu/base.py +++ b/tests/dictionaries/01boolean_no_mandatory/tiramisu/base.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = BoolOption(name="my_variable", doc="my_variable", default=True, properties=frozenset({"normal"})) -optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/dictionaries/01boolean_no_mandatory/tiramisu/multi.py b/tests/dictionaries/01boolean_no_mandatory/tiramisu/multi.py index fe915e924..81f238db0 100644 --- a/tests/dictionaries/01boolean_no_mandatory/tiramisu/multi.py +++ b/tests/dictionaries/01boolean_no_mandatory/tiramisu/multi.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = BoolOption(name="my_variable", doc="my_variable", default=True, properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="1", doc="1", children=[optiondescription_4]) option_2 = BoolOption(name="my_variable", doc="my_variable", default=True, properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3, optiondescription_5]) diff --git a/tests/dictionaries/01family_description/tiramisu/base.py b/tests/dictionaries/01family_description/tiramisu/base.py index 9c781dbe6..e9f128c02 100644 --- a/tests/dictionaries/01family_description/tiramisu/base.py +++ b/tests/dictionaries/01family_description/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="Other description", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01family_description/tiramisu/multi.py b/tests/dictionaries/01family_description/tiramisu/multi.py index 3330654bc..0038de8de 100644 --- a/tests/dictionaries/01family_description/tiramisu/multi.py +++ b/tests/dictionaries/01family_description/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="Other description", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="Other description", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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 830bd8cc3..b072c8fbd 100644 --- a/tests/dictionaries/01fill_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3], properties=frozenset({"basic"})) 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 ebfcb6a47..152d68fd6 100644 --- a/tests/dictionaries/01fill_autofreeze/tiramisu/multi.py +++ b/tests/dictionaries/01fill_autofreeze/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3], properties=frozenset({"basic"})) 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, option_5, option_6], properties=frozenset({"basic"})) 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/01fill_autosave/tiramisu/base.py b/tests/dictionaries/01fill_autosave/tiramisu/base.py index 125c733f9..f7da929d4 100644 --- a/tests/dictionaries/01fill_autosave/tiramisu/base.py +++ b/tests/dictionaries/01fill_autosave/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif1", 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((ParamOption(option_4)))), properties=frozenset({"basic", "force_store_value"})) optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"basic"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/01fill_autosave/tiramisu/multi.py b/tests/dictionaries/01fill_autosave/tiramisu/multi.py index c1cf5d783..d32d1e84d 100644 --- a/tests/dictionaries/01fill_autosave/tiramisu/multi.py +++ b/tests/dictionaries/01fill_autosave/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif1", 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((ParamOption(option_4)))), properties=frozenset({"basic", "force_store_value"})) optiondescription_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"basic"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"basic"})) 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_8 = StrOption(name="mode_conteneur_actif1", 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((ParamOption(option_8)))), properties=frozenset({"basic", "force_store_value"})) optiondescription_6 = OptionDescription(name="general", doc="general", children=[option_7, option_8], properties=frozenset({"basic"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_5, optiondescription_6]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_5, optiondescription_6], properties=frozenset({"basic"})) 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/01fill_base/tiramisu/base.py b/tests/dictionaries/01fill_base/tiramisu/base.py index fdf4ce9c8..ebcf7cdcc 100644 --- a/tests/dictionaries/01fill_base/tiramisu/base.py +++ b/tests/dictionaries/01fill_base/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01fill_base/tiramisu/multi.py b/tests/dictionaries/01fill_base/tiramisu/multi.py index 304751f1c..d8d7663f3 100644 --- a/tests/dictionaries/01fill_base/tiramisu/multi.py +++ b/tests/dictionaries/01fill_base/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_6 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/01fill_mandatory/tiramisu/base.py b/tests/dictionaries/01fill_mandatory/tiramisu/base.py index 786b3fb54..fbf575a1c 100644 --- a/tests/dictionaries/01fill_mandatory/tiramisu/base.py +++ b/tests/dictionaries/01fill_mandatory/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"basic", "mandatory"})) option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"expert", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"basic"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01fill_mandatory/tiramisu/multi.py b/tests/dictionaries/01fill_mandatory/tiramisu/multi.py index e7e45d0cb..a244f2c1f 100644 --- a/tests/dictionaries/01fill_mandatory/tiramisu/multi.py +++ b/tests/dictionaries/01fill_mandatory/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"basic", "mandatory"})) option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"expert", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"basic"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_6 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"basic", "mandatory"})) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"expert", "mandatory"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"basic"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"basic"})) 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/01fill_number/tiramisu/base.py b/tests/dictionaries/01fill_number/tiramisu/base.py index 75a8c1d23..3c6d3067b 100644 --- a/tests/dictionaries/01fill_number/tiramisu/base.py +++ b/tests/dictionaries/01fill_number/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = IntOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue(3)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01fill_number/tiramisu/multi.py b/tests/dictionaries/01fill_number/tiramisu/multi.py index 18d2aa4e0..955afd7ed 100644 --- a/tests/dictionaries/01fill_number/tiramisu/multi.py +++ b/tests/dictionaries/01fill_number/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = IntOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue(3)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = IntOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue(3)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) option_6 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/01fill_only_optional/tiramisu/base.py b/tests/dictionaries/01fill_only_optional/tiramisu/base.py index aa75e3138..0b341cc62 100644 --- a/tests/dictionaries/01fill_only_optional/tiramisu/base.py +++ b/tests/dictionaries/01fill_only_optional/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params(())), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01fill_only_optional/tiramisu/multi.py b/tests/dictionaries/01fill_only_optional/tiramisu/multi.py index 6004b88ac..0c3fd0336 100644 --- a/tests/dictionaries/01fill_only_optional/tiramisu/multi.py +++ b/tests/dictionaries/01fill_only_optional/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params(())), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params(())), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) option_6 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/01fill_optional/tiramisu/base.py b/tests/dictionaries/01fill_optional/tiramisu/base.py index f4cd902f7..557b85fbb 100644 --- a/tests/dictionaries/01fill_optional/tiramisu/base.py +++ b/tests/dictionaries/01fill_optional/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/01fill_optional/tiramisu/multi.py b/tests/dictionaries/01fill_optional/tiramisu/multi.py index 6e35dd533..f0173e877 100644 --- a/tests/dictionaries/01fill_optional/tiramisu/multi.py +++ b/tests/dictionaries/01fill_optional/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_6 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/01fill_quote/tiramisu/base.py b/tests/dictionaries/01fill_quote/tiramisu/base.py index 0f3da4471..86dd3f249 100644 --- a/tests/dictionaries/01fill_quote/tiramisu/base.py +++ b/tests/dictionaries/01fill_quote/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote'")))), properties=frozenset({"normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote\"")))), properties=frozenset({"normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote\"'")))), properties=frozenset({"normal"})) option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote\"\\'")))), properties=frozenset({"normal"})) 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]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/01fill_quote/tiramisu/multi.py b/tests/dictionaries/01fill_quote/tiramisu/multi.py index 3f89806df..ff40769e5 100644 --- a/tests/dictionaries/01fill_quote/tiramisu/multi.py +++ b/tests/dictionaries/01fill_quote/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote'")))), properties=frozenset({"normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote\"")))), properties=frozenset({"normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote\"'")))), properties=frozenset({"normal"})) option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote\"\\'")))), properties=frozenset({"normal"})) 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote'")))), properties=frozenset({"normal"})) option_8 = StrOption(name="mode_conteneur_actif1", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote\"")))), properties=frozenset({"normal"})) option_9 = StrOption(name="mode_conteneur_actif2", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote\"'")))), properties=frozenset({"normal"})) option_10 = StrOption(name="mode_conteneur_actif3", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("quote\"\\'")))), properties=frozenset({"normal"})) 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/01fill_target_optional/tiramisu/base.py b/tests/dictionaries/01fill_target_optional/tiramisu/base.py index 80f20b798..7130c00a0 100644 --- a/tests/dictionaries/01fill_target_optional/tiramisu/base.py +++ b/tests/dictionaries/01fill_target_optional/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01fill_target_optional/tiramisu/multi.py b/tests/dictionaries/01fill_target_optional/tiramisu/multi.py index 4e6c7a9d7..4b80c9e95 100644 --- a/tests/dictionaries/01fill_target_optional/tiramisu/multi.py +++ b/tests/dictionaries/01fill_target_optional/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01hidden_if_in_autofreeze/tiramisu/base.py b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py index ffdce5c8d..2e74dfd49 100644 --- a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"basic"})) 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 33d47e91f..aa8e5f523 100644 --- a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/multi.py +++ b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"basic"})) 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, 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_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"basic"})) 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/01test/tiramisu/base.py b/tests/dictionaries/01test/tiramisu/base.py index 97c8e3650..59a458558 100644 --- a/tests/dictionaries/01test/tiramisu/base.py +++ b/tests/dictionaries/01test/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) option_2.impl_set_information('test', ('test',)) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01test/tiramisu/multi.py b/tests/dictionaries/01test/tiramisu/multi.py index b557234d3..d42e8e1be 100644 --- a/tests/dictionaries/01test/tiramisu/multi.py +++ b/tests/dictionaries/01test/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) option_2.impl_set_information('test', ('test',)) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) option_4.impl_set_information('test', ('test',)) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01test_multi/tiramisu/base.py b/tests/dictionaries/01test_multi/tiramisu/base.py index 4129db454..2cf0fd24e 100644 --- a/tests/dictionaries/01test_multi/tiramisu/base.py +++ b/tests/dictionaries/01test_multi/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) option_2.impl_set_information('test', ('test1', 'test2')) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01test_multi/tiramisu/multi.py b/tests/dictionaries/01test_multi/tiramisu/multi.py index 4604b77ea..109837eda 100644 --- a/tests/dictionaries/01test_multi/tiramisu/multi.py +++ b/tests/dictionaries/01test_multi/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) option_2.impl_set_information('test', ('test1', 'test2')) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) option_4.impl_set_information('test', ('test1', 'test2')) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01test_multi_none/tiramisu/base.py b/tests/dictionaries/01test_multi_none/tiramisu/base.py index d5f1d93a6..1ac78ec89 100644 --- a/tests/dictionaries/01test_multi_none/tiramisu/base.py +++ b/tests/dictionaries/01test_multi_none/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) option_2.impl_set_information('test', (None, 'test1', 'test2')) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01test_multi_none/tiramisu/multi.py b/tests/dictionaries/01test_multi_none/tiramisu/multi.py index a667e7b3a..3a45a6a56 100644 --- a/tests/dictionaries/01test_multi_none/tiramisu/multi.py +++ b/tests/dictionaries/01test_multi_none/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) option_2.impl_set_information('test', (None, 'test1', 'test2')) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) option_4.impl_set_information('test', (None, 'test1', 'test2')) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01test_redefine/tiramisu/base.py b/tests/dictionaries/01test_redefine/tiramisu/base.py index 49bdd4a37..72606e19d 100644 --- a/tests/dictionaries/01test_redefine/tiramisu/base.py +++ b/tests/dictionaries/01test_redefine/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) option_2.impl_set_information('test', ('test1',)) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01test_redefine/tiramisu/multi.py b/tests/dictionaries/01test_redefine/tiramisu/multi.py index 2b5f3e3ec..0e732dd8b 100644 --- a/tests/dictionaries/01test_redefine/tiramisu/multi.py +++ b/tests/dictionaries/01test_redefine/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) option_2.impl_set_information('test', ('test1',)) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) option_4.impl_set_information('test', ('test1',)) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/01test_redefine_base/tiramisu/base.py b/tests/dictionaries/01test_redefine_base/tiramisu/base.py index a17fbdcb6..58f7d672b 100644 --- a/tests/dictionaries/01test_redefine_base/tiramisu/base.py +++ b/tests/dictionaries/01test_redefine_base/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"})) option_1.impl_set_information('test', ('test1',)) -optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/dictionaries/01test_redefine_base/tiramisu/multi.py b/tests/dictionaries/01test_redefine_base/tiramisu/multi.py index 2cf6a3a88..d005f51e4 100644 --- a/tests/dictionaries/01test_redefine_base/tiramisu/multi.py +++ b/tests/dictionaries/01test_redefine_base/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"})) option_1.impl_set_information('test', ('test1',)) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="1", doc="1", children=[optiondescription_4]) option_2 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"})) option_2.impl_set_information('test', ('test1',)) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3, optiondescription_5]) diff --git a/tests/dictionaries/01test_redefine_remove/tiramisu/base.py b/tests/dictionaries/01test_redefine_remove/tiramisu/base.py index 6f86dc28e..935d23394 100644 --- a/tests/dictionaries/01test_redefine_remove/tiramisu/base.py +++ b/tests/dictionaries/01test_redefine_remove/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/01test_redefine_remove/tiramisu/multi.py b/tests/dictionaries/01test_redefine_remove/tiramisu/multi.py index 1ea87b84a..1326f247d 100644 --- a/tests/dictionaries/01test_redefine_remove/tiramisu/multi.py +++ b/tests/dictionaries/01test_redefine_remove/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="mode_conteneur_actif", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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 4113d537b..5c370b41f 100644 --- a/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"basic"})) 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 195727441..c57213e05 100644 --- a/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/multi.py +++ b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"basic"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_5, optiondescription_6], properties=frozenset({"basic"})) 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/02fill_multi_calc_val/tiramisu/base.py b/tests/dictionaries/02fill_multi_calc_val/tiramisu/base.py index f13ae7ba6..f9c346a78 100644 --- a/tests/dictionaries/02fill_multi_calc_val/tiramisu/base.py +++ b/tests/dictionaries/02fill_multi_calc_val/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="var1", doc="var1", default="no", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="var2", doc="var2", multi=True, default=Calculation(func.calc_value, Params((ParamOption(option_1)), kwargs={'multi': ParamValue(True)})), properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/02fill_multi_calc_val/tiramisu/multi.py b/tests/dictionaries/02fill_multi_calc_val/tiramisu/multi.py index 83ec6cc19..e507f4ad1 100644 --- a/tests/dictionaries/02fill_multi_calc_val/tiramisu/multi.py +++ b/tests/dictionaries/02fill_multi_calc_val/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="var1", doc="var1", default="no", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="var2", doc="var2", multi=True, default=Calculation(func.calc_value, Params((ParamOption(option_1)), kwargs={'multi': ParamValue(True)})), properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_3 = StrOption(name="var1", doc="var1", default="no", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="var2", doc="var2", multi=True, default=Calculation(func.calc_value, Params((ParamOption(option_3)), kwargs={'multi': ParamValue(True)})), properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"normal"})) 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/02fill_multi_calc_val_multi/tiramisu/base.py b/tests/dictionaries/02fill_multi_calc_val_multi/tiramisu/base.py index cfd94e8bb..faa834b73 100644 --- a/tests/dictionaries/02fill_multi_calc_val_multi/tiramisu/base.py +++ b/tests/dictionaries/02fill_multi_calc_val_multi/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="var1", doc="var1", multi=True, default=['no', 'yes', 'maybe'], default_multi="no", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="var2", doc="var2", multi=True, default=Calculation(func.calc_value, Params((ParamOption(option_1)))), properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/02fill_multi_calc_val_multi/tiramisu/multi.py b/tests/dictionaries/02fill_multi_calc_val_multi/tiramisu/multi.py index 3ebf116fa..bd9114025 100644 --- a/tests/dictionaries/02fill_multi_calc_val_multi/tiramisu/multi.py +++ b/tests/dictionaries/02fill_multi_calc_val_multi/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="var1", doc="var1", multi=True, default=['no', 'yes', 'maybe'], default_multi="no", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="var2", doc="var2", multi=True, default=Calculation(func.calc_value, Params((ParamOption(option_1)))), properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_3 = StrOption(name="var1", doc="var1", multi=True, default=['no', 'yes', 'maybe'], default_multi="no", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="var2", doc="var2", multi=True, default=Calculation(func.calc_value, Params((ParamOption(option_3)))), properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"normal"})) 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/10autosave_hidden/tiramisu/base.py b/tests/dictionaries/10autosave_hidden/tiramisu/base.py index f88fd558f..ad85968ee 100644 --- a/tests/dictionaries/10autosave_hidden/tiramisu/base.py +++ b/tests/dictionaries/10autosave_hidden/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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", "frozen", "hidden"})) 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10autosave_hidden/tiramisu/multi.py b/tests/dictionaries/10autosave_hidden/tiramisu/multi.py index 78e91a9c4..576f87cff 100644 --- a/tests/dictionaries/10autosave_hidden/tiramisu/multi.py +++ b/tests/dictionaries/10autosave_hidden/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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", "frozen", "hidden"})) 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"basic"})) 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", "frozen", "hidden"})) 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_5, optiondescription_6], properties=frozenset({"basic"})) 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/10base_certificate_list/tiramisu/base.py b/tests/dictionaries/10base_certificate_list/tiramisu/base.py index f2a006b5c..41beb5652 100644 --- a/tests/dictionaries/10base_certificate_list/tiramisu/base.py +++ b/tests/dictionaries/10base_certificate_list/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_6 = SymLinkOption(name="domain", opt=option_1) option_7 = StrOption(name="name", doc="name", default="certificate") option_8 = UsernameOption(name="owner", doc="owner", default="example") diff --git a/tests/dictionaries/10base_certificate_list/tiramisu/multi.py b/tests/dictionaries/10base_certificate_list/tiramisu/multi.py index d07c0c84f..f658e1e04 100644 --- a/tests/dictionaries/10base_certificate_list/tiramisu/multi.py +++ b/tests/dictionaries/10base_certificate_list/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="domain", opt=option_1) option_8 = StrOption(name="name", doc="name", default="certificate") option_9 = UsernameOption(name="owner", doc="owner", default="example") @@ -36,7 +41,7 @@ optiondescription_22.impl_set_information('type', "service") optiondescription_21 = OptionDescription(name="services", doc="services", children=[optiondescription_22], properties=frozenset({"hidden"})) optiondescription_19 = OptionDescription(name="1", doc="1", children=[optiondescription_20, optiondescription_21]) option_2 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) option_15 = SymLinkOption(name="domain", opt=option_2) option_16 = StrOption(name="name", doc="name", default="certificate") option_17 = UsernameOption(name="owner", doc="owner", default="example") diff --git a/tests/dictionaries/10base_certificate_list_disabled/tiramisu/base.py b/tests/dictionaries/10base_certificate_list_disabled/tiramisu/base.py index 66cc3f28a..fe4ea88df 100644 --- a/tests/dictionaries/10base_certificate_list_disabled/tiramisu/base.py +++ b/tests/dictionaries/10base_certificate_list_disabled/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_6 = SymLinkOption(name="domain", opt=option_1) option_7 = StrOption(name="name", doc="name", default="certificate") option_8 = UsernameOption(name="owner", doc="owner", default="example") diff --git a/tests/dictionaries/10base_certificate_list_disabled/tiramisu/multi.py b/tests/dictionaries/10base_certificate_list_disabled/tiramisu/multi.py index 3069092b4..4426edc10 100644 --- a/tests/dictionaries/10base_certificate_list_disabled/tiramisu/multi.py +++ b/tests/dictionaries/10base_certificate_list_disabled/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="domain", opt=option_1) option_8 = StrOption(name="name", doc="name", default="certificate") option_9 = UsernameOption(name="owner", doc="owner", default="example") @@ -36,7 +41,7 @@ optiondescription_22.impl_set_information('type', "service") optiondescription_21 = OptionDescription(name="services", doc="services", children=[optiondescription_22], properties=frozenset({"hidden"})) optiondescription_19 = OptionDescription(name="1", doc="1", children=[optiondescription_20, optiondescription_21]) option_2 = DomainnameOption(name="server_name", doc="server_name", default="example.net", type='domainname', allow_ip=False, properties=frozenset({"mandatory", "normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) option_15 = SymLinkOption(name="domain", opt=option_2) option_16 = StrOption(name="name", doc="name", default="certificate") option_17 = UsernameOption(name="owner", doc="owner", default="example") diff --git a/tests/dictionaries/10check_base/tiramisu/base.py b/tests/dictionaries/10check_base/tiramisu/base.py index cdcd016d8..5410ddf8c 100644 --- a/tests/dictionaries/10check_base/tiramisu/base.py +++ b/tests/dictionaries/10check_base/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_3 = IntOption(name="int", doc="No change", min_number=0, max_number=100, properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/10check_base/tiramisu/multi.py b/tests/dictionaries/10check_base/tiramisu/multi.py index 071cf6a41..2bc20c94c 100644 --- a/tests/dictionaries/10check_base/tiramisu/multi.py +++ b/tests/dictionaries/10check_base/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_3 = IntOption(name="int", doc="No change", min_number=0, max_number=100, properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_6 = IntOption(name="int", doc="No change", min_number=0, max_number=100, properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/10check_base_target_optional/tiramisu/base.py b/tests/dictionaries/10check_base_target_optional/tiramisu/base.py index d9c0c1c64..f6e1e127c 100644 --- a/tests/dictionaries/10check_base_target_optional/tiramisu/base.py +++ b/tests/dictionaries/10check_base_target_optional/tiramisu/base.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"})) -optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/dictionaries/10check_base_target_optional/tiramisu/multi.py b/tests/dictionaries/10check_base_target_optional/tiramisu/multi.py index 5bb2f23f0..b3d78e184 100644 --- a/tests/dictionaries/10check_base_target_optional/tiramisu/multi.py +++ b/tests/dictionaries/10check_base_target_optional/tiramisu/multi.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="1", doc="1", children=[optiondescription_4]) option_2 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3, optiondescription_5]) diff --git a/tests/dictionaries/10check_no_param/tiramisu/base.py b/tests/dictionaries/10check_no_param/tiramisu/base.py index bcdbda022..ee3f00791 100644 --- a/tests/dictionaries/10check_no_param/tiramisu/base.py +++ b/tests/dictionaries/10check_no_param/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_3 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption(whole=False))), warnings_only=False)], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/10check_no_param/tiramisu/multi.py b/tests/dictionaries/10check_no_param/tiramisu/multi.py index 3e0a2558a..b589b1a4e 100644 --- a/tests/dictionaries/10check_no_param/tiramisu/multi.py +++ b/tests/dictionaries/10check_no_param/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_3 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption(whole=False))), warnings_only=False)], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_6 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption(whole=False))), warnings_only=False)], properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/10check_option/tiramisu/base.py b/tests/dictionaries/10check_option/tiramisu/base.py index a7a0d6fba..138fe8002 100644 --- a/tests/dictionaries/10check_option/tiramisu/base.py +++ b/tests/dictionaries/10check_option/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_3 = IntOption(name="int2", doc="No change", default=100, properties=frozenset({"mandatory", "normal"})) option_4 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption(whole=False)), kwargs={'mini': ParamValue(0), 'maxi': ParamOption(option_3)}), warnings_only=False)], 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10check_option/tiramisu/multi.py b/tests/dictionaries/10check_option/tiramisu/multi.py index 2b439996f..21a86a503 100644 --- a/tests/dictionaries/10check_option/tiramisu/multi.py +++ b/tests/dictionaries/10check_option/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_3 = IntOption(name="int2", doc="No change", default=100, properties=frozenset({"mandatory", "normal"})) option_4 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption(whole=False)), kwargs={'mini': ParamValue(0), 'maxi': ParamOption(option_3)}), warnings_only=False)], 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_7 = IntOption(name="int2", doc="No change", default=100, properties=frozenset({"mandatory", "normal"})) option_8 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption(whole=False)), kwargs={'mini': ParamValue(0), 'maxi': ParamOption(option_7)}), warnings_only=False)], 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10check_optional/tiramisu/base.py b/tests/dictionaries/10check_optional/tiramisu/base.py index 8d298b523..e8a0e1747 100644 --- a/tests/dictionaries/10check_optional/tiramisu/base.py +++ b/tests/dictionaries/10check_optional/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_4 = IntOption(name="int2", doc="No change", properties=frozenset({"normal"})) option_3 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False)], 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10check_optional/tiramisu/multi.py b/tests/dictionaries/10check_optional/tiramisu/multi.py index e7a50bc71..21c6c207d 100644 --- a/tests/dictionaries/10check_optional/tiramisu/multi.py +++ b/tests/dictionaries/10check_optional/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_4 = IntOption(name="int2", doc="No change", properties=frozenset({"normal"})) option_3 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False)], 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_8 = IntOption(name="int2", doc="No change", properties=frozenset({"normal"})) option_7 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_8))), warnings_only=False)], 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10check_valid_differ/tiramisu/base.py b/tests/dictionaries/10check_valid_differ/tiramisu/base.py index 9fb635607..1ab373570 100644 --- a/tests/dictionaries/10check_valid_differ/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_3))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/10check_valid_differ/tiramisu/multi.py b/tests/dictionaries/10check_valid_differ/tiramisu/multi.py index 73ff7d383..76758ad99 100644 --- a/tests/dictionaries/10check_valid_differ/tiramisu/multi.py +++ b/tests/dictionaries/10check_valid_differ/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_3))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_6 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_6))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/10check_valid_differ_add/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py index 7bdd66bd7..6500ab4a8 100644 --- a/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_3))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_3))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) 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]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/10check_valid_differ_add/tiramisu/multi.py b/tests/dictionaries/10check_valid_differ_add/tiramisu/multi.py index e364cf87e..de29aa266 100644 --- a/tests/dictionaries/10check_valid_differ_add/tiramisu/multi.py +++ b/tests/dictionaries/10check_valid_differ_add/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_3))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_3))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_8 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_9 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_10 = StrOption(name="mode_conteneur_actif3", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_8))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_8))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_9))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py index c5d7ecfd7..a5fa3b032 100644 --- a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_3))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) 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]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/multi.py b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/multi.py index 9c7388f7c..10b8fe33d 100644 --- a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/multi.py +++ b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif3", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_3))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_8 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_9 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_10 = StrOption(name="mode_conteneur_actif3", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_8))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_9))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/10check_valid_in_network/tiramisu/base.py b/tests/dictionaries/10check_valid_in_network/tiramisu/base.py index 09e3dca9d..9ef50e39d 100644 --- a/tests/dictionaries/10check_valid_in_network/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_in_network/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_3 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) option_4 = NetmaskOption(name="adresse_netmask_eth0", doc="Masque de sous réseau de la carte", properties=frozenset({"basic", "mandatory"})) option_5 = IPOption(name="adresse_ip", doc="IP", validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(whole=False), ParamOption(option_3), ParamOption(option_4))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4, option_5], properties=frozenset({"basic"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/10check_valid_in_network/tiramisu/multi.py b/tests/dictionaries/10check_valid_in_network/tiramisu/multi.py index f0413f9f4..df162cf3d 100644 --- a/tests/dictionaries/10check_valid_in_network/tiramisu/multi.py +++ b/tests/dictionaries/10check_valid_in_network/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_3 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) option_4 = NetmaskOption(name="adresse_netmask_eth0", doc="Masque de sous réseau de la carte", properties=frozenset({"basic", "mandatory"})) option_5 = IPOption(name="adresse_ip", doc="IP", validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(whole=False), ParamOption(option_3), ParamOption(option_4))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4, option_5], properties=frozenset({"basic"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_8 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) option_9 = NetmaskOption(name="adresse_netmask_eth0", doc="Masque de sous réseau de la carte", properties=frozenset({"basic", "mandatory"})) option_10 = IPOption(name="adresse_ip", doc="IP", validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(whole=False), ParamOption(option_8), ParamOption(option_9))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) optiondescription_6 = OptionDescription(name="general", doc="general", children=[option_7, option_8, option_9, option_10], properties=frozenset({"basic"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"basic"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py index 5369913ef..367d0fdc8 100644 --- a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_3 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", cidr=True, properties=frozenset({"basic", "mandatory"})) option_4 = IPOption(name="adresse_ip", doc="IP", validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(whole=False), ParamOption(option_3))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"basic"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/multi.py b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/multi.py index 1c369e7eb..b11b4c7ef 100644 --- a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/multi.py +++ b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_3 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", cidr=True, properties=frozenset({"basic", "mandatory"})) option_4 = IPOption(name="adresse_ip", doc="IP", validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(whole=False), ParamOption(option_3))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"basic"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_7 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", cidr=True, properties=frozenset({"basic", "mandatory"})) option_8 = IPOption(name="adresse_ip", doc="IP", validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(whole=False), ParamOption(option_7))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"basic"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"basic"})) 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/10check_valid_ipnetmask/tiramisu/base.py b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py index 1defe9f2e..e775c997e 100644 --- a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_3 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) option_4 = NetmaskOption(name="adresse_netmask_eth0", doc="Masque de sous réseau de la carte", validators=[Calculation(func.valid_ipnetmask, Params((ParamSelfOption(whole=False), ParamOption(option_3))), warnings_only=True)], properties=frozenset({"basic", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"basic"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/multi.py b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/multi.py index d8b68ff06..98ebcbb07 100644 --- a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/multi.py +++ b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_3 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) option_4 = NetmaskOption(name="adresse_netmask_eth0", doc="Masque de sous réseau de la carte", validators=[Calculation(func.valid_ipnetmask, Params((ParamSelfOption(whole=False), ParamOption(option_3))), warnings_only=True)], properties=frozenset({"basic", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"basic"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_7 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) option_8 = NetmaskOption(name="adresse_netmask_eth0", doc="Masque de sous réseau de la carte", validators=[Calculation(func.valid_ipnetmask, Params((ParamSelfOption(whole=False), ParamOption(option_7))), warnings_only=True)], properties=frozenset({"basic", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, option_7, option_8], properties=frozenset({"basic"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"basic"})) 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/10check_valid_jinja/__init__.py b/tests/dictionaries/10check_valid_jinja/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/10check_valid_jinja/makedict/after.json b/tests/dictionaries/10check_valid_jinja/makedict/after.json new file mode 100644 index 000000000..f0a909af9 --- /dev/null +++ b/tests/dictionaries/10check_valid_jinja/makedict/after.json @@ -0,0 +1,10 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "oui" + }, + "rougail.general.mode_conteneur_actif1": { + "owner": "default", + "value": "non" + } +} diff --git a/tests/dictionaries/10check_valid_jinja/makedict/base.json b/tests/dictionaries/10check_valid_jinja/makedict/base.json new file mode 100644 index 000000000..a13f65aab --- /dev/null +++ b/tests/dictionaries/10check_valid_jinja/makedict/base.json @@ -0,0 +1,4 @@ +{ + "rougail.general.mode_conteneur_actif": "oui", + "rougail.general.mode_conteneur_actif1": "non" +} diff --git a/tests/dictionaries/10check_valid_jinja/makedict/before.json b/tests/dictionaries/10check_valid_jinja/makedict/before.json new file mode 100644 index 000000000..f0a909af9 --- /dev/null +++ b/tests/dictionaries/10check_valid_jinja/makedict/before.json @@ -0,0 +1,10 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "oui" + }, + "rougail.general.mode_conteneur_actif1": { + "owner": "default", + "value": "non" + } +} diff --git a/tests/dictionaries/10check_valid_jinja/tiramisu/base.py b/tests/dictionaries/10check_valid_jinja/tiramisu/base.py new file mode 100644 index 000000000..ca3457046 --- /dev/null +++ b/tests/dictionaries/10check_valid_jinja/tiramisu/base.py @@ -0,0 +1,60 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['rougail.general.mode_conteneur_actif'] = "{% if rougail.general.mode_conteneur_actif == rougail.general.mode_conteneur_actif1 %}the value must be different than \"{{ rougail.general.mode_conteneur_actif }}\"{% endif %}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) +option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", validators=[Calculation(func.valid_with_jinja, Params((ParamSelfOption(whole=False)), kwargs={'__internal_jinja': ParamValue("rougail.general.mode_conteneur_actif"), '__internal_key': ParamValue("rougail.general.mode_conteneur_actif"), 'rougail.general.mode_conteneur_actif1': ParamOption(option_3)}), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) +optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/10check_valid_jinja/tiramisu/multi.py b/tests/dictionaries/10check_valid_jinja/tiramisu/multi.py new file mode 100644 index 000000000..8074f62b9 --- /dev/null +++ b/tests/dictionaries/10check_valid_jinja/tiramisu/multi.py @@ -0,0 +1,67 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['1.rougail.general.mode_conteneur_actif'] = "{% if rougail.general.mode_conteneur_actif == rougail.general.mode_conteneur_actif1 %}the value must be different than \"{{ rougail.general.mode_conteneur_actif }}\"{% endif %}" +dict_env['2.rougail.general.mode_conteneur_actif'] = "{% if rougail.general.mode_conteneur_actif == rougail.general.mode_conteneur_actif1 %}the value must be different than \"{{ rougail.general.mode_conteneur_actif }}\"{% endif %}" +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) +option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", validators=[Calculation(func.valid_with_jinja, Params((ParamSelfOption(whole=False)), kwargs={'__internal_jinja': ParamValue("1.rougail.general.mode_conteneur_actif"), '__internal_key': ParamValue("rougail.general.mode_conteneur_actif"), 'rougail.general.mode_conteneur_actif1': ParamOption(option_3)}), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) +optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) +option_6 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) +option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", validators=[Calculation(func.valid_with_jinja, Params((ParamSelfOption(whole=False)), kwargs={'__internal_jinja': ParamValue("2.rougail.general.mode_conteneur_actif"), '__internal_key': ParamValue("rougail.general.mode_conteneur_actif"), 'rougail.general.mode_conteneur_actif1': ParamOption(option_6)}), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) +optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) +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/10check_valid_jinja/xml/00-base.xml b/tests/dictionaries/10check_valid_jinja/xml/00-base.xml new file mode 100644 index 000000000..9638da061 --- /dev/null +++ b/tests/dictionaries/10check_valid_jinja/xml/00-base.xml @@ -0,0 +1,18 @@ + + + + + + oui + + + non + + + + + + mode_conteneur_actif + + + diff --git a/tests/dictionaries/10check_valid_jinja/yml/00-base.yml b/tests/dictionaries/10check_valid_jinja/yml/00-base.yml new file mode 100644 index 000000000..f16885856 --- /dev/null +++ b/tests/dictionaries/10check_valid_jinja/yml/00-base.yml @@ -0,0 +1,24 @@ +version: '0.10' +variables: +- family: + - name: general + variables: + - variable: + - name: mode_conteneur_actif + type: string + description: No change + value: + - text: oui + - name: mode_conteneur_actif1 + type: string + description: No change + value: + - text: non +constraints: +- check: + - name: '{% if rougail.general.mode_conteneur_actif == rougail.general.mode_conteneur_actif1 + %}the value must be different than "{{ rougail.general.mode_conteneur_actif + }}"{% endif %}' + type: jinja + target: + - text: mode_conteneur_actif diff --git a/tests/dictionaries/10fill_information/tiramisu/base.py b/tests/dictionaries/10fill_information/tiramisu/base.py index eb3638370..253008ebb 100644 --- a/tests/dictionaries/10fill_information/tiramisu/base.py +++ b/tests/dictionaries/10fill_information/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamInformation("test_information", None)))), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/10fill_information/tiramisu/multi.py b/tests/dictionaries/10fill_information/tiramisu/multi.py index 191235cda..cdc392178 100644 --- a/tests/dictionaries/10fill_information/tiramisu/multi.py +++ b/tests/dictionaries/10fill_information/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamInformation("test_information", None)))), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamInformation("test_information", None)))), properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/10fill_information_multi/tiramisu/base.py b/tests/dictionaries/10fill_information_multi/tiramisu/base.py index 62730531f..229cf47b2 100644 --- a/tests/dictionaries/10fill_information_multi/tiramisu/base.py +++ b/tests/dictionaries/10fill_information_multi/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", multi=True, default=[Calculation(func.calc_val, Params((ParamInformation("test_information", []))))], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/10fill_information_multi/tiramisu/multi.py b/tests/dictionaries/10fill_information_multi/tiramisu/multi.py index bc8adccfd..d6712d81b 100644 --- a/tests/dictionaries/10fill_information_multi/tiramisu/multi.py +++ b/tests/dictionaries/10fill_information_multi/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", multi=True, default=[Calculation(func.calc_val, Params((ParamInformation("test_information", []))))], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", multi=True, default=[Calculation(func.calc_val, Params((ParamInformation("test_information", []))))], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/10fill_option_information/tiramisu/base.py b/tests/dictionaries/10fill_option_information/tiramisu/base.py index a00bc9df4..4c8ae4107 100644 --- a/tests/dictionaries/10fill_option_information/tiramisu/base.py +++ b/tests/dictionaries/10fill_option_information/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="variable", doc="No change", properties=frozenset({"normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamInformation("test_information", None, option=option_2)))), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/10fill_option_information/tiramisu/multi.py b/tests/dictionaries/10fill_option_information/tiramisu/multi.py index 73d10f6d8..1d7ebffc3 100644 --- a/tests/dictionaries/10fill_option_information/tiramisu/multi.py +++ b/tests/dictionaries/10fill_option_information/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="variable", doc="No change", properties=frozenset({"normal"})) option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamInformation("test_information", None, option=option_2)))), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="variable", doc="No change", properties=frozenset({"normal"})) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamInformation("test_information", None, option=option_5)))), properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/10fill_option_od_information/tiramisu/base.py b/tests/dictionaries/10fill_option_od_information/tiramisu/base.py index 942338d20..c89f8b333 100644 --- a/tests/dictionaries/10fill_option_od_information/tiramisu/base.py +++ b/tests/dictionaries/10fill_option_od_information/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_4 = StrOption(name="variable", doc="No change", properties=frozenset({"normal"})) option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamInformation("test_information", None, option=option_4)))), properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="od", doc="od", children=[option_4], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10fill_option_od_information/tiramisu/multi.py b/tests/dictionaries/10fill_option_od_information/tiramisu/multi.py index ff5d7d5a7..7d35cbade 100644 --- a/tests/dictionaries/10fill_option_od_information/tiramisu/multi.py +++ b/tests/dictionaries/10fill_option_od_information/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_4 = StrOption(name="variable", doc="No change", properties=frozenset({"normal"})) option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamInformation("test_information", None, option=option_4)))), properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="od", doc="od", children=[option_4], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_8 = StrOption(name="variable", doc="No change", properties=frozenset({"normal"})) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamInformation("test_information", None, option=option_8)))), properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="od", doc="od", children=[option_8], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6, optiondescription_7], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10fill_target_information/tiramisu/base.py b/tests/dictionaries/10fill_target_information/tiramisu/base.py index 8a14a79a4..d75642508 100644 --- a/tests/dictionaries/10fill_target_information/tiramisu/base.py +++ b/tests/dictionaries/10fill_target_information/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamSelfInformation("test_information", None)))), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/10fill_target_information/tiramisu/multi.py b/tests/dictionaries/10fill_target_information/tiramisu/multi.py index f8aab5207..3504407b0 100644 --- a/tests/dictionaries/10fill_target_information/tiramisu/multi.py +++ b/tests/dictionaries/10fill_target_information/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamSelfInformation("test_information", None)))), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamSelfInformation("test_information", None)))), properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/10frozenifin_unknown_valid_enum_number/tiramisu/base.py b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/base.py index 3ec56983b..b1104b46f 100644 --- a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/base.py +++ b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="enumvar", values=(1, 2, 3), default=1, properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") option_5 = IntOption(name="test_variable", doc="test variable", properties=frozenset({"expert"})) optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4, option_5], properties=frozenset({"expert"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/multi.py b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/multi.py index 4252b12b4..d2fc9d96f 100644 --- a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/multi.py +++ b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/multi.py @@ -16,15 +16,20 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="enumvar", values=(1, 2, 3), default=1, properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") option_5 = IntOption(name="test_variable", doc="test variable", properties=frozenset({"expert"})) optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4, option_5], properties=frozenset({"expert"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_6 = OptionDescription(name="general", doc="general", children=[option_7], properties=frozenset({"expert"})) @@ -32,6 +37,6 @@ option_9 = ChoiceOption(name="enumvar", doc="enumvar", values=(1, 2, 3), default option_9.impl_set_information('help', "bla bla bla") option_10 = IntOption(name="test_variable", doc="test variable", properties=frozenset({"expert"})) optiondescription_8 = OptionDescription(name="enumfam", doc="enumfam", children=[option_9, option_10], properties=frozenset({"expert"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6, optiondescription_8]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6, optiondescription_8], properties=frozenset({"expert"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/10leadership_append/tiramisu/base.py b/tests/dictionaries/10leadership_append/tiramisu/base.py index 09370d838..6acd25634 100644 --- a/tests/dictionaries/10leadership_append/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append/tiramisu/base.py @@ -16,15 +16,20 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"})) option_8 = StrOption(name="follower3", doc="follower3", multi=True, properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9]) diff --git a/tests/dictionaries/10leadership_append/tiramisu/multi.py b/tests/dictionaries/10leadership_append/tiramisu/multi.py index 3cf98bb63..a68afad4e 100644 --- a/tests/dictionaries/10leadership_append/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_append/tiramisu/multi.py @@ -16,26 +16,31 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"})) option_8 = StrOption(name="follower3", doc="follower3", multi=True, properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="1", doc="1", children=[optiondescription_18]) option_10 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_9 = OptionDescription(name="general", doc="general", children=[option_10], properties=frozenset({"normal"})) -option_13 = StrOption(name="leader", doc="leader", multi=True) +option_13 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_14 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_15 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_14)))), properties=frozenset({"normal"})) option_16 = StrOption(name="follower3", doc="follower3", multi=True, properties=frozenset({"normal"})) optiondescription_12 = Leadership(name="leader", doc="leader", children=[option_13, option_14, option_15, option_16], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="general1", doc="general1", children=[optiondescription_12], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_9, optiondescription_11]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_9, optiondescription_11], properties=frozenset({"normal"})) optiondescription_19 = OptionDescription(name="2", doc="2", children=[optiondescription_20]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_17, optiondescription_19]) diff --git a/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py index 83ee268ac..ce5a91be9 100644 --- a/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py @@ -16,15 +16,20 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"force_default_on_freeze", "frozen"})) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) 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", "normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) option_8 = StrOption(name="follower3", doc="follower3", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7, option_8], properties=frozenset({"hidden", "normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9]) diff --git a/tests/dictionaries/10leadership_append_hidden/tiramisu/multi.py b/tests/dictionaries/10leadership_append_hidden/tiramisu/multi.py index 37a9392d2..c5b2855a1 100644 --- a/tests/dictionaries/10leadership_append_hidden/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_append_hidden/tiramisu/multi.py @@ -16,26 +16,31 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"force_default_on_freeze", "frozen"})) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) 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", "normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) option_8 = StrOption(name="follower3", doc="follower3", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7, option_8], properties=frozenset({"hidden", "normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="1", doc="1", children=[optiondescription_18]) option_10 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_9 = OptionDescription(name="general", doc="general", children=[option_10], properties=frozenset({"normal"})) -option_13 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"force_default_on_freeze", "frozen"})) +option_13 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) option_14 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) option_15 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_14)))), properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) option_16 = StrOption(name="follower3", doc="follower3", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) optiondescription_12 = Leadership(name="leader", doc="leader", children=[option_13, option_14, option_15, option_16], properties=frozenset({"hidden", "normal"})) optiondescription_11 = OptionDescription(name="general1", doc="general1", children=[optiondescription_12], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_9, optiondescription_11]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_9, optiondescription_11], properties=frozenset({"normal"})) optiondescription_19 = OptionDescription(name="2", doc="2", children=[optiondescription_20]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_17, optiondescription_19]) diff --git a/tests/dictionaries/10leadership_append_name/tiramisu/base.py b/tests/dictionaries/10leadership_append_name/tiramisu/base.py index dd3cac4ad..ee255fcd6 100644 --- a/tests/dictionaries/10leadership_append_name/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append_name/tiramisu/base.py @@ -16,15 +16,20 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"})) option_8 = StrOption(name="follower3", doc="follower3", multi=True, properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leadership", doc="leadership", children=[option_5, option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9]) diff --git a/tests/dictionaries/10leadership_append_name/tiramisu/multi.py b/tests/dictionaries/10leadership_append_name/tiramisu/multi.py index 0edf8e999..3839fdcd7 100644 --- a/tests/dictionaries/10leadership_append_name/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_append_name/tiramisu/multi.py @@ -16,26 +16,31 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"})) option_8 = StrOption(name="follower3", doc="follower3", multi=True, properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leadership", doc="leadership", children=[option_5, option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="1", doc="1", children=[optiondescription_18]) option_10 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_9 = OptionDescription(name="general", doc="general", children=[option_10], properties=frozenset({"normal"})) -option_13 = StrOption(name="leader", doc="leader", multi=True) +option_13 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_14 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_15 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_14)))), properties=frozenset({"normal"})) option_16 = StrOption(name="follower3", doc="follower3", multi=True, properties=frozenset({"normal"})) optiondescription_12 = Leadership(name="leadership", doc="leadership", children=[option_13, option_14, option_15, option_16], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="general1", doc="general1", children=[optiondescription_12], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_9, optiondescription_11]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_9, optiondescription_11], properties=frozenset({"normal"})) optiondescription_19 = OptionDescription(name="2", doc="2", children=[optiondescription_20]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_17, optiondescription_19]) diff --git a/tests/dictionaries/10leadership_auto/tiramisu/base.py b/tests/dictionaries/10leadership_auto/tiramisu/base.py index b81ef1d46..4e992d54f 100644 --- a/tests/dictionaries/10leadership_auto/tiramisu/base.py +++ b/tests/dictionaries/10leadership_auto/tiramisu/base.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_5 = 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"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) option_7 = StrOption(name="follower3", doc="follower3", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_4)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8]) diff --git a/tests/dictionaries/10leadership_auto/tiramisu/multi.py b/tests/dictionaries/10leadership_auto/tiramisu/multi.py index dac4bf2d4..633dab09c 100644 --- a/tests/dictionaries/10leadership_auto/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_auto/tiramisu/multi.py @@ -16,24 +16,29 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_5 = 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"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) option_7 = StrOption(name="follower3", doc="follower3", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_4)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16]) option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_11 = StrOption(name="leader", doc="leader", multi=True) +option_11 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_12 = 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"})) option_13 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_12)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) option_14 = StrOption(name="follower3", doc="follower3", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_11)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_10 = Leadership(name="leader", doc="leader", children=[option_11, option_12, option_13, option_14], properties=frozenset({"normal"})) optiondescription_8 = OptionDescription(name="general", doc="general", children=[option_9, optiondescription_10], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="2", doc="2", children=[optiondescription_18]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_17]) diff --git a/tests/dictionaries/10leadership_auto_index/tiramisu/base.py b/tests/dictionaries/10leadership_auto_index/tiramisu/base.py index 95546a21e..aad9952c5 100644 --- a/tests/dictionaries/10leadership_auto_index/tiramisu/base.py +++ b/tests/dictionaries/10leadership_auto_index/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * -option_2 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b', 'c'], properties=frozenset({"mandatory"})) + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +option_2 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b', 'c'], properties=frozenset({"mandatory", "normal"})) option_3 = IntOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((ParamIndex()))), properties=frozenset({"normal"})) optiondescription_1 = Leadership(name="leader", doc="leader", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/10leadership_auto_index/tiramisu/multi.py b/tests/dictionaries/10leadership_auto_index/tiramisu/multi.py index da8fa3607..4db93c5c6 100644 --- a/tests/dictionaries/10leadership_auto_index/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_auto_index/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * -option_2 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b', 'c'], properties=frozenset({"mandatory"})) + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +option_2 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b', 'c'], properties=frozenset({"mandatory", "normal"})) option_3 = IntOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((ParamIndex()))), properties=frozenset({"normal"})) optiondescription_1 = Leadership(name="leader", doc="leader", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) -option_5 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b', 'c'], properties=frozenset({"mandatory"})) +option_5 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b', 'c'], properties=frozenset({"mandatory", "normal"})) option_6 = IntOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((ParamIndex()))), properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/10leadership_autoleader/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py index 625f925ac..d10633bdf 100644 --- a/tests/dictionaries/10leadership_autoleader/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_5 = 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"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_4)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/10leadership_autoleader/tiramisu/multi.py b/tests/dictionaries/10leadership_autoleader/tiramisu/multi.py index b4b274a86..1ea0c713d 100644 --- a/tests/dictionaries/10leadership_autoleader/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_autoleader/tiramisu/multi.py @@ -16,22 +16,27 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_5 = 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"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_4)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) option_8 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_10 = StrOption(name="leader", doc="leader", multi=True) +option_10 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_11 = 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"})) option_12 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_10)))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_9 = Leadership(name="leader", doc="leader", children=[option_10, option_11, option_12], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="general", doc="general", children=[option_8, optiondescription_9], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7], properties=frozenset({"normal"})) 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/10leadership_autoleader_expert/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py index ea04818c3..146014bb4 100644 --- a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")}))) +option_5 = StrOption(name="leader", doc="leader", multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"expert"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"expert"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"expert"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"expert"})) optiondescription_3 = OptionDescription(name="leadermode", doc="leadermode", children=[optiondescription_4], properties=frozenset({"expert"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8]) diff --git a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/multi.py b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/multi.py index 256dec114..a5945a16b 100644 --- a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/multi.py @@ -16,24 +16,29 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")}))) +option_5 = StrOption(name="leader", doc="leader", multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"expert"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"expert"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"expert"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"expert"})) optiondescription_3 = OptionDescription(name="leadermode", doc="leadermode", children=[optiondescription_4], properties=frozenset({"expert"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) 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, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")}))) +option_12 = StrOption(name="leader", doc="leader", multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"expert"})) option_13 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"expert"})) option_14 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"expert"})) optiondescription_11 = Leadership(name="leader", doc="leader", children=[option_12, option_13, option_14], properties=frozenset({"expert"})) optiondescription_10 = OptionDescription(name="leadermode", doc="leadermode", children=[optiondescription_11], properties=frozenset({"expert"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10], properties=frozenset({"expert"})) optiondescription_17 = OptionDescription(name="2", doc="2", children=[optiondescription_18]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_17]) diff --git a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py index 8f048985e..292deec62 100644 --- a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_5 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5)))), properties=frozenset({"expert"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/multi.py b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/multi.py index 6bb5aae19..2916cc29b 100644 --- a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/multi.py @@ -16,22 +16,27 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_5 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5)))), properties=frozenset({"expert"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) option_8 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_10 = StrOption(name="leader", doc="leader", multi=True) +option_10 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_11 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_12 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_11)))), properties=frozenset({"expert"})) optiondescription_9 = Leadership(name="leader", doc="leader", children=[option_10, option_11, option_12], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="general", doc="general", children=[option_8, optiondescription_9], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7], properties=frozenset({"normal"})) 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/10leadership_empty/tiramisu/base.py b/tests/dictionaries/10leadership_empty/tiramisu/base.py index c9d5f9f4b..4dd3f5778 100644 --- a/tests/dictionaries/10leadership_empty/tiramisu/base.py +++ b/tests/dictionaries/10leadership_empty/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[]) + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[], properties=frozenset({"expert"})) option_2 = BoolOption(name="activate", doc="activate", default=True) option_3 = BoolOption(name="manage", doc="manage", default=True) optiondescription_6 = OptionDescription(name="tata_service", doc="tata.service", children=[option_2, option_3]) diff --git a/tests/dictionaries/10leadership_empty/tiramisu/multi.py b/tests/dictionaries/10leadership_empty/tiramisu/multi.py index bb1314dc4..d4f12df9e 100644 --- a/tests/dictionaries/10leadership_empty/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_empty/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[]) + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[], properties=frozenset({"expert"})) option_3 = BoolOption(name="activate", doc="activate", default=True) option_4 = BoolOption(name="manage", doc="manage", default=True) optiondescription_10 = OptionDescription(name="tata_service", doc="tata.service", children=[option_3, option_4]) optiondescription_10.impl_set_information('type', "service") optiondescription_9 = OptionDescription(name="services", doc="services", children=[optiondescription_10], properties=frozenset({"hidden"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8, optiondescription_9]) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[], properties=frozenset({"expert"})) option_5 = BoolOption(name="activate", doc="activate", default=True) option_6 = BoolOption(name="manage", doc="manage", default=True) optiondescription_14 = OptionDescription(name="tata_service", doc="tata.service", children=[option_5, option_6]) diff --git a/tests/dictionaries/10leadership_hidden/__init__.py b/tests/dictionaries/10leadership_hidden/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/10leadership_mandatory/makedict/after.json b/tests/dictionaries/10leadership_hidden/makedict/after.json similarity index 79% rename from tests/dictionaries/10leadership_mandatory/makedict/after.json rename to tests/dictionaries/10leadership_hidden/makedict/after.json index 548ec3acc..a06c87b44 100644 --- a/tests/dictionaries/10leadership_mandatory/makedict/after.json +++ b/tests/dictionaries/10leadership_hidden/makedict/after.json @@ -3,7 +3,7 @@ "owner": "default", "value": "non" }, - "rougail.general.leader.leader": { + "rougail.leadermode.leader.leader": { "owner": "default", "value": [] } diff --git a/tests/dictionaries/10leadership_mandatory/makedict/base.json b/tests/dictionaries/10leadership_hidden/makedict/base.json similarity index 56% rename from tests/dictionaries/10leadership_mandatory/makedict/base.json rename to tests/dictionaries/10leadership_hidden/makedict/base.json index 9031a92aa..fe8a1c7ae 100644 --- a/tests/dictionaries/10leadership_mandatory/makedict/base.json +++ b/tests/dictionaries/10leadership_hidden/makedict/base.json @@ -1,4 +1,4 @@ { "rougail.general.mode_conteneur_actif": "non", - "rougail.general.leader.leader": [] + "rougail.leadermode.leader.leader": [] } diff --git a/tests/dictionaries/10leadership_mandatory/makedict/before.json b/tests/dictionaries/10leadership_hidden/makedict/before.json similarity index 79% rename from tests/dictionaries/10leadership_mandatory/makedict/before.json rename to tests/dictionaries/10leadership_hidden/makedict/before.json index 548ec3acc..a06c87b44 100644 --- a/tests/dictionaries/10leadership_mandatory/makedict/before.json +++ b/tests/dictionaries/10leadership_hidden/makedict/before.json @@ -3,7 +3,7 @@ "owner": "default", "value": "non" }, - "rougail.general.leader.leader": { + "rougail.leadermode.leader.leader": { "owner": "default", "value": [] } diff --git a/tests/dictionaries/10leadership_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_hidden/tiramisu/base.py new file mode 100644 index 000000000..0c39bc6b2 --- /dev/null +++ b/tests/dictionaries/10leadership_hidden/tiramisu/base.py @@ -0,0 +1,34 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +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, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) +option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) +option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) +optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"hidden", "normal"})) +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], properties=frozenset({"normal"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8]) diff --git a/tests/dictionaries/10leadership_hidden/tiramisu/multi.py b/tests/dictionaries/10leadership_hidden/tiramisu/multi.py new file mode 100644 index 000000000..5cd5bb4ec --- /dev/null +++ b/tests/dictionaries/10leadership_hidden/tiramisu/multi.py @@ -0,0 +1,44 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +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, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) +option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) +option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) +optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"hidden", "normal"})) +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], properties=frozenset({"normal"})) +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, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) +option_13 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) +option_14 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) +optiondescription_11 = Leadership(name="leader", doc="leader", children=[option_12, option_13, option_14], properties=frozenset({"hidden", "normal"})) +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], properties=frozenset({"normal"})) +optiondescription_17 = OptionDescription(name="2", doc="2", children=[optiondescription_18]) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_17]) diff --git a/tests/dictionaries/10leadership_mandatory/xml/00-base.xml b/tests/dictionaries/10leadership_hidden/xml/00-base.xml similarity index 72% rename from tests/dictionaries/10leadership_mandatory/xml/00-base.xml rename to tests/dictionaries/10leadership_hidden/xml/00-base.xml index c4f408014..009ff3c6e 100644 --- a/tests/dictionaries/10leadership_mandatory/xml/00-base.xml +++ b/tests/dictionaries/10leadership_hidden/xml/00-base.xml @@ -1,25 +1,23 @@ - + non - + + + - + valfill - follower1 - - - follower1 - follower2 + leader diff --git a/tests/dictionaries/10leadership_mandatory/yml/00-base.yml b/tests/dictionaries/10leadership_hidden/yml/00-base.yml similarity index 79% rename from tests/dictionaries/10leadership_mandatory/yml/00-base.yml rename to tests/dictionaries/10leadership_hidden/yml/00-base.yml index f6052c0aa..f383a91fb 100644 --- a/tests/dictionaries/10leadership_mandatory/yml/00-base.yml +++ b/tests/dictionaries/10leadership_hidden/yml/00-base.yml @@ -2,6 +2,7 @@ version: '0.10' variables: - family: - name: general + mode: expert variables: - variable: - name: mode_conteneur_actif @@ -9,10 +10,13 @@ variables: description: No change value: - text: non + - name: leadermode + variables: - family: - name: leader description: leader leadership: true + hidden: true variables: - variable: - name: leader @@ -22,21 +26,14 @@ variables: - name: follower1 type: string description: follower1 - mandatory: true - name: follower2 type: string description: follower2 constraints: - fill: - - name: calc_val + - name: calc_list param: - name: valeur text: valfill target: - - text: follower1 - - name: calc_val - param: - - type: variable - text: follower1 - target: - - text: follower2 + - text: leader diff --git a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py index e2a555dca..0c39bc6b2 100644 --- a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen"})) +option_5 = StrOption(name="leader", doc="leader", multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"hidden", "normal"})) 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]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8]) diff --git a/tests/dictionaries/10leadership_leader_hidden/tiramisu/multi.py b/tests/dictionaries/10leadership_leader_hidden/tiramisu/multi.py index bf78614e2..5cd5bb4ec 100644 --- a/tests/dictionaries/10leadership_leader_hidden/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_leader_hidden/tiramisu/multi.py @@ -16,24 +16,29 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen"})) +option_5 = StrOption(name="leader", doc="leader", multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"hidden", "normal"})) 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_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) 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, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen"})) +option_12 = StrOption(name="leader", doc="leader", multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) option_13 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) option_14 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"force_default_on_freeze", "frozen", "normal"})) optiondescription_11 = Leadership(name="leader", doc="leader", children=[option_12, option_13, option_14], properties=frozenset({"hidden", "normal"})) 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_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="2", doc="2", children=[optiondescription_18]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_17]) 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 59652fc79..381694927 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_5 = StrOption(name="leader", doc="leader", 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_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]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) 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 2cfa324f0..35392e10f 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/multi.py @@ -16,24 +16,29 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_5 = StrOption(name="leader", doc="leader", 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_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_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) 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, 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_12 = StrOption(name="leader", doc="leader", 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_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_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="2", doc="2", children=[optiondescription_18]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_17]) 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 a23856d7b..8a60ac2b5 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 @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_5 = StrOption(name="leader", doc="leader", 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_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]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) 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 f1de18937..35abc8e9b 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 @@ -16,24 +16,29 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_5 = StrOption(name="leader", doc="leader", 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_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_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) 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, 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_12 = StrOption(name="leader", doc="leader", 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_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_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="2", doc="2", children=[optiondescription_18]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_17]) diff --git a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py index 8daaf02b1..07ede7e31 100644 --- a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"mandatory"})) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"basic", "mandatory"})) option_5 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5)))), properties=frozenset({"normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"basic"})) -optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/10leadership_leadermandatory/tiramisu/multi.py b/tests/dictionaries/10leadership_leadermandatory/tiramisu/multi.py index 8c1a6cf6b..acbcc6e71 100644 --- a/tests/dictionaries/10leadership_leadermandatory/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_leadermandatory/tiramisu/multi.py @@ -16,22 +16,27 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"mandatory"})) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"basic", "mandatory"})) option_5 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5)))), properties=frozenset({"normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"basic"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) option_8 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_10 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"mandatory"})) +option_10 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"basic", "mandatory"})) option_11 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_12 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_11)))), properties=frozenset({"normal"})) optiondescription_9 = Leadership(name="leader", doc="leader", children=[option_10, option_11, option_12], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="general", doc="general", children=[option_8, optiondescription_9], properties=frozenset({"basic"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7], properties=frozenset({"basic"})) 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/10leadership_mandatory/tiramisu/base.py b/tests/dictionaries/10leadership_mandatory/tiramisu/base.py deleted file mode 100644 index 9ab12a6f6..000000000 --- a/tests/dictionaries/10leadership_mandatory/tiramisu/base.py +++ /dev/null @@ -1,28 +0,0 @@ -from importlib.machinery import SourceFileLoader as _SourceFileLoader -from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec -class func: - pass - -def _load_functions(path): - global _SourceFileLoader, _spec_from_loader, _module_from_spec, func - loader = _SourceFileLoader('func', path) - spec = _spec_from_loader(loader.name, loader) - func_ = _module_from_spec(spec) - loader.exec_module(func_) - for function in dir(func_): - if function.startswith('_'): - continue - setattr(func, function, getattr(func_, function)) -_load_functions('tests/dictionaries/../eosfunc/test.py') -try: - from tiramisu4 import * -except: - from tiramisu import * -option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) -option_5 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"mandatory", "normal"})) -option_6 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5)))), properties=frozenset({"normal"})) -optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) -optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/10leadership_mandatory/tiramisu/multi.py b/tests/dictionaries/10leadership_mandatory/tiramisu/multi.py deleted file mode 100644 index 4ff3b5daf..000000000 --- a/tests/dictionaries/10leadership_mandatory/tiramisu/multi.py +++ /dev/null @@ -1,37 +0,0 @@ -from importlib.machinery import SourceFileLoader as _SourceFileLoader -from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec -class func: - pass - -def _load_functions(path): - global _SourceFileLoader, _spec_from_loader, _module_from_spec, func - loader = _SourceFileLoader('func', path) - spec = _spec_from_loader(loader.name, loader) - func_ = _module_from_spec(spec) - loader.exec_module(func_) - for function in dir(func_): - if function.startswith('_'): - continue - setattr(func, function, getattr(func_, function)) -_load_functions('tests/dictionaries/../eosfunc/test.py') -try: - from tiramisu4 import * -except: - from tiramisu import * -option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) -option_5 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"mandatory", "normal"})) -option_6 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5)))), properties=frozenset({"normal"})) -optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) -optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) -optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) -option_8 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_10 = StrOption(name="leader", doc="leader", multi=True) -option_11 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"mandatory", "normal"})) -option_12 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_11)))), properties=frozenset({"normal"})) -optiondescription_9 = Leadership(name="leader", doc="leader", children=[option_10, option_11, option_12], properties=frozenset({"normal"})) -optiondescription_7 = OptionDescription(name="general", doc="general", children=[option_8, optiondescription_9], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7]) -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/10leadership_mandatoryfollower/tiramisu/base.py b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py index 6608729e6..a7d7f150c 100644 --- a/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py +++ b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_4 = NetmaskOption(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", multi=True) +option_4 = NetmaskOption(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", multi=True, properties=frozenset({"normal"})) option_5 = NetworkOption(name="nut_monitor_host", doc="Adresse IP du réseau de l'esclave", multi=True, properties=frozenset({"basic", "mandatory"})) optiondescription_3 = Leadership(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", children=[option_4, option_5], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/multi.py b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/multi.py index 7afb698ac..d279b65e5 100644 --- a/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_4 = NetmaskOption(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", multi=True) +option_4 = NetmaskOption(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", multi=True, properties=frozenset({"normal"})) option_5 = NetworkOption(name="nut_monitor_host", doc="Adresse IP du réseau de l'esclave", multi=True, properties=frozenset({"basic", "mandatory"})) optiondescription_3 = Leadership(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", children=[option_4, option_5], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_9 = NetmaskOption(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", multi=True) +option_9 = NetmaskOption(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", multi=True, properties=frozenset({"normal"})) option_10 = NetworkOption(name="nut_monitor_host", doc="Adresse IP du réseau de l'esclave", multi=True, properties=frozenset({"basic", "mandatory"})) optiondescription_8 = Leadership(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", children=[option_9, option_10], properties=frozenset({"normal"})) optiondescription_6 = OptionDescription(name="general", doc="général", children=[option_7, optiondescription_8], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/10leadership_mandatoryfollower_value/tiramisu/base.py b/tests/dictionaries/10leadership_mandatoryfollower_value/tiramisu/base.py index cafa017d1..b7ecb265a 100644 --- a/tests/dictionaries/10leadership_mandatoryfollower_value/tiramisu/base.py +++ b/tests/dictionaries/10leadership_mandatoryfollower_value/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_4 = NetmaskOption(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", multi=True) +option_4 = NetmaskOption(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", multi=True, properties=frozenset({"normal"})) option_5 = NetworkOption(name="nut_monitor_host", doc="Adresse IP du réseau de l'esclave", multi=True, default_multi="192.168.0.0", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = Leadership(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", children=[option_4, option_5], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/10leadership_mandatoryfollower_value/tiramisu/multi.py b/tests/dictionaries/10leadership_mandatoryfollower_value/tiramisu/multi.py index 954a2ce99..99997f62f 100644 --- a/tests/dictionaries/10leadership_mandatoryfollower_value/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_mandatoryfollower_value/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_4 = NetmaskOption(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", multi=True) +option_4 = NetmaskOption(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", multi=True, properties=frozenset({"normal"})) option_5 = NetworkOption(name="nut_monitor_host", doc="Adresse IP du réseau de l'esclave", multi=True, default_multi="192.168.0.0", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = Leadership(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", children=[option_4, option_5], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_9 = NetmaskOption(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", multi=True) +option_9 = NetmaskOption(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", multi=True, properties=frozenset({"normal"})) option_10 = NetworkOption(name="nut_monitor_host", doc="Adresse IP du réseau de l'esclave", multi=True, default_multi="192.168.0.0", properties=frozenset({"mandatory", "normal"})) optiondescription_8 = Leadership(name="nut_monitor_netmask", doc="Masque de l'IP du réseau de l'esclave", children=[option_9, option_10], properties=frozenset({"normal"})) optiondescription_6 = OptionDescription(name="general", doc="général", children=[option_7, optiondescription_8], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/10leadership_multi/tiramisu/base.py b/tests/dictionaries/10leadership_multi/tiramisu/base.py index 7bd5e1f45..91bad5e87 100644 --- a/tests/dictionaries/10leadership_multi/tiramisu/base.py +++ b/tests/dictionaries/10leadership_multi/tiramisu/base.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) -option_9 = StrOption(name="leader1", doc="leader", multi=True) +option_9 = StrOption(name="leader1", doc="leader", multi=True, properties=frozenset({"normal"})) option_10 = StrOption(name="follower11", doc="follower1", multi=True, properties=frozenset({"normal"})) option_11 = StrOption(name="follower21", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_8 = Leadership(name="leader1", doc="leader", children=[option_9, option_10, option_11], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4, optiondescription_8], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_12]) diff --git a/tests/dictionaries/10leadership_multi/tiramisu/multi.py b/tests/dictionaries/10leadership_multi/tiramisu/multi.py index 7e7bdb23f..8efd3d6c0 100644 --- a/tests/dictionaries/10leadership_multi/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_multi/tiramisu/multi.py @@ -16,32 +16,37 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) -option_9 = StrOption(name="leader1", doc="leader", multi=True) +option_9 = StrOption(name="leader1", doc="leader", multi=True, properties=frozenset({"normal"})) option_10 = StrOption(name="follower11", doc="follower1", multi=True, properties=frozenset({"normal"})) option_11 = StrOption(name="follower21", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_8 = Leadership(name="leader1", doc="leader", children=[option_9, option_10, option_11], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4, optiondescription_8], properties=frozenset({"normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) optiondescription_23 = OptionDescription(name="1", doc="1", children=[optiondescription_24]) option_13 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_12 = OptionDescription(name="general", doc="general", children=[option_13], properties=frozenset({"normal"})) -option_16 = StrOption(name="leader", doc="leader", multi=True) +option_16 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_17 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_18 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_17)))), properties=frozenset({"normal"})) optiondescription_15 = Leadership(name="leader", doc="leader", children=[option_16, option_17, option_18], properties=frozenset({"normal"})) -option_20 = StrOption(name="leader1", doc="leader", multi=True) +option_20 = StrOption(name="leader1", doc="leader", multi=True, properties=frozenset({"normal"})) option_21 = StrOption(name="follower11", doc="follower1", multi=True, properties=frozenset({"normal"})) option_22 = StrOption(name="follower21", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_19 = Leadership(name="leader1", doc="leader", children=[option_20, option_21, option_22], properties=frozenset({"normal"})) optiondescription_14 = OptionDescription(name="general1", doc="general1", children=[optiondescription_15, optiondescription_19], properties=frozenset({"normal"})) -optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_12, optiondescription_14]) +optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_12, optiondescription_14], properties=frozenset({"normal"})) optiondescription_25 = OptionDescription(name="2", doc="2", children=[optiondescription_26]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_23, optiondescription_25]) diff --git a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py index c5ac217f5..d166a5cbd 100644 --- a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 52dbfb91c..15b3e1b4a 100644 --- a/tests/dictionaries/10load_disabled_if_in/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_disabled_if_in_fill/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/base.py index ad36fde29..c0dc90c8f 100644 --- a/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) 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 8a1d7f790..6f976df89 100644 --- a/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_disabled_if_in_list_optional/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_list_optional/tiramisu/base.py index 418a41989..8334b667a 100644 --- a/tests/dictionaries/10load_disabled_if_in_list_optional/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_list_optional/tiramisu/base.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/dictionaries/10load_disabled_if_in_list_optional/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_list_optional/tiramisu/multi.py index bce3652e6..9f8efbee3 100644 --- a/tests/dictionaries/10load_disabled_if_in_list_optional/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_list_optional/tiramisu/multi.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="1", doc="1", children=[optiondescription_4]) option_2 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3, 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 8f812870d..1972d2afd 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_10 = StrOption(name="source", doc="source", default="file1") option_8 = 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(["oui", "maybe"]), 'condition_operator': ParamValue("OR")}))) 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 2157be0e5..5651ec2f4 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_14 = StrOption(name="source", doc="source", default="file1") option_12 = 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(["oui", "maybe"]), 'condition_operator': ParamValue("OR")}))) @@ -38,7 +43,7 @@ option_6 = StrOption(name="condition", doc="No change", default="non", propertie 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]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_21 = StrOption(name="source", doc="source", default="file1") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue(["oui", "maybe"]), 'condition_operator': ParamValue("OR")}))) 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 57c394424..f14ef4098 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_10 = StrOption(name="source", doc="source", default="file1") option_8 = 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", "maybe"]), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) 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 cfff663d0..1173a2a22 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_14 = StrOption(name="source", doc="source", default="file1") option_12 = 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", "maybe"]), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) @@ -38,7 +43,7 @@ option_6 = StrOption(name="condition", doc="No change", default="no", properties 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, 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]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_21 = StrOption(name="source", doc="source", default="file1") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_7, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) 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 28b6357c9..fb1902665 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_10 = StrOption(name="source", doc="source", default="file1") option_8 = 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", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) 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 69d0ac3ba..52afdbc39 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_14 = StrOption(name="source", doc="source", default="file1") option_12 = 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", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) @@ -38,7 +43,7 @@ option_6 = StrOption(name="condition", doc="No change", default="no", properties 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, 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]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_21 = StrOption(name="source", doc="source", default="file1") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_7, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) 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 83788047e..b7d553566 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_10 = StrOption(name="source", doc="source", default="file1") option_8 = 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", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) 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 ff4cc3a35..b51c8e069 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_14 = StrOption(name="source", doc="source", default="file1") option_12 = 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", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) @@ -38,7 +43,7 @@ option_6 = StrOption(name="condition", doc="No change", default="yes", propertie 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, 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]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_21 = StrOption(name="source", doc="source", default="file1") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_7, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) 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 98e91ceed..26cf60a67 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_10 = StrOption(name="source", doc="source", default="file1") option_8 = 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", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) 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 a601c8850..7995ce6a8 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_14 = StrOption(name="source", doc="source", default="file1") option_12 = 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", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) @@ -38,7 +43,7 @@ option_6 = StrOption(name="condition", doc="No change", default="yes", propertie 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, 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]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_21 = StrOption(name="source", doc="source", default="file1") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_7, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) 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 86e23f30c..02b1cb244 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_10 = StrOption(name="source", doc="source", default="file1") option_8 = 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", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) 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 2980ffde3..e9c0493f4 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_14 = StrOption(name="source", doc="source", default="file1") option_12 = 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", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) @@ -38,7 +43,7 @@ option_6 = StrOption(name="condition", doc="No change", default="no", properties 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, 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]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_21 = StrOption(name="source", doc="source", default="file1") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_7, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])}))) 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 afc19547a..1870fbcbe 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_10 = StrOption(name="source", doc="source", default="file1") option_8 = 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(["oui", "maybe"]), 'condition_operator': ParamValue("OR")}))) 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 569c4033d..91d2a02ad 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_14 = StrOption(name="source", doc="source", default="file1") option_12 = 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(["oui", "maybe"]), 'condition_operator': ParamValue("OR")}))) @@ -38,7 +43,7 @@ option_6 = StrOption(name="condition", doc="No change", default="oui", propertie 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]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_21 = StrOption(name="source", doc="source", default="file1") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue(["oui", "maybe"]), 'condition_operator': ParamValue("OR")}))) 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 be2df3a2a..dff81f0f3 100644 --- a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 4c93b49aa..9e0aa89cc 100644 --- a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_disabled_if_in_twice/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/base.py index 3a9d43eef..38bf6765f 100644 --- a/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3], properties=frozenset({"normal"})) 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 fd541a7b1..efc299a5e 100644 --- a/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3], properties=frozenset({"normal"})) 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) 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 cc49f1dac..86cf6883d 100644 --- a/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 9169a4335..0575d9ac9 100644 --- a/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_disabled_if_in_variable2/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/base.py index c1f069400..4e1daa486 100644 --- a/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 37a04b191..c1a9e346f 100644 --- a/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_disabled_if_not_in_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py index 27032fa64..79d2b28cc 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="disable_variable", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_8 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_9 = StrOption(name="source", doc="source", default="file1") option_7 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/multi.py index 1c61902fc..acca3b2cd 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/multi.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="disable_variable", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_11 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_12 = StrOption(name="source", doc="source", default="file1") option_10 = BoolOption(name="activate", doc="activate", default=True) @@ -36,7 +41,7 @@ optiondescription_21 = OptionDescription(name="1", doc="1", children=[optiondesc option_5 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="disable_variable", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) option_18 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_19 = StrOption(name="source", doc="source", default="file1") option_17 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py index 40e521211..9fb762737 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"disabled", "mandatory", "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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/multi.py index e02d74849..610858500 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"disabled", "mandatory", "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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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({"disabled", "mandatory", "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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_disabledifin_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py index 1125f0cd1..8a92168aa 100644 --- a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 7d24c35bb..a06f22fa1 100644 --- a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_disabledifin_fallback_force/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py index 6d083bd46..cb18be276 100644 --- a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 1b2cd2754..7ff4047ce 100644 --- a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_disabledifin_whithouttype/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py index 6d083bd46..cb18be276 100644 --- a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 1b2cd2754..7ff4047ce 100644 --- a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_frozenifin/tiramisu/base.py b/tests/dictionaries/10load_frozenifin/tiramisu/base.py index c5c16dbea..9849ab658 100644 --- a/tests/dictionaries/10load_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 1f0442a7a..47d705f0a 100644 --- a/tests/dictionaries/10load_frozenifin/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifin/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_frozenifin_auto/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py index f72a8892d..3c2a9f103 100644 --- a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 b5cb77b6f..6fdf48f36 100644 --- a/tests/dictionaries/10load_frozenifin_auto/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifin_auto/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_frozenifin_multiparam/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py index f2497c133..066ca08ef 100644 --- a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 a2311614f..8c9ab3698 100644 --- a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_frozenifin_noexist/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py index 39ae5b3bc..ddcf2b0c3 100644 --- a/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_frozenifin_noexist/tiramisu/multi.py b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/multi.py index 37c42785e..b53f41ee6 100644 --- a/tests/dictionaries/10load_frozenifin_noexist/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_8 = StrOption(name="mode_conteneur_actif2", 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, option_7, option_8], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_frozenifin_variable/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py index e0152038c..a54d17ea6 100644 --- a/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 c788aa9d5..cf4638236 100644 --- a/tests/dictionaries/10load_frozenifin_variable/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifin_variable/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_frozenifnotin/tiramisu/base.py b/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py index 46de92d44..c945fc18a 100644 --- a/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 a23f6a5aa..15b1ee754 100644 --- a/tests/dictionaries/10load_frozenifnotin/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifnotin/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_frozenifnotin_noexist/tiramisu/base.py b/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/base.py index 39ae5b3bc..ddcf2b0c3 100644 --- a/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/multi.py b/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/multi.py index 37c42785e..b53f41ee6 100644 --- a/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_8 = StrOption(name="mode_conteneur_actif2", 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, option_7, option_8], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_hidden_if_empty_family/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py index 0d51166fc..82febd39a 100644 --- a/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 05c9ff02a..19beadef1 100644 --- a/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/multi.py +++ b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py index c75a2d69e..fb7cb4d5e 100644 --- a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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, 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]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_5], properties=frozenset({"normal"})) 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 bb56ea87e..cb8f57999 100644 --- a/tests/dictionaries/10load_hidden_if_family/tiramisu/multi.py +++ b/tests/dictionaries/10load_hidden_if_family/tiramisu/multi.py @@ -16,15 +16,20 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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, 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_5], properties=frozenset({"normal"})) 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, 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)})) @@ -32,6 +37,6 @@ option_10 = StrOption(name="mode_conteneur_actif2", doc="No change", default="no 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, 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_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7, optiondescription_11], properties=frozenset({"normal"})) 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/tiramisu/base.py b/tests/dictionaries/10load_leadership/tiramisu/base.py index f07892455..b2e1e40ed 100644 --- a/tests/dictionaries/10load_leadership/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership/tiramisu/base.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8]) diff --git a/tests/dictionaries/10load_leadership/tiramisu/multi.py b/tests/dictionaries/10load_leadership/tiramisu/multi.py index e2a5f2feb..26bdb6957 100644 --- a/tests/dictionaries/10load_leadership/tiramisu/multi.py +++ b/tests/dictionaries/10load_leadership/tiramisu/multi.py @@ -16,24 +16,29 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16]) option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_8 = OptionDescription(name="general", doc="general", children=[option_9], properties=frozenset({"normal"})) -option_12 = StrOption(name="leader", doc="leader", multi=True) +option_12 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_13 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_14 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_13)))), properties=frozenset({"normal"})) optiondescription_11 = Leadership(name="leader", doc="leader", children=[option_12, option_13, option_14], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="general1", doc="general1", children=[optiondescription_11], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="2", doc="2", children=[optiondescription_18]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_17]) diff --git a/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py b/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py index 273dee0ed..5d0eed403 100644 --- a/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="leader", multi=True, default=['non'], default_multi="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_5 = StrOption(name="follower1", doc="follower1", multi=True, default_multi="value", properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/10load_leadership_default_multi/tiramisu/multi.py b/tests/dictionaries/10load_leadership_default_multi/tiramisu/multi.py index 4296aee1a..66fbeddff 100644 --- a/tests/dictionaries/10load_leadership_default_multi/tiramisu/multi.py +++ b/tests/dictionaries/10load_leadership_default_multi/tiramisu/multi.py @@ -16,22 +16,27 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="leader", multi=True, default=['non'], default_multi="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_5 = StrOption(name="follower1", doc="follower1", multi=True, default_multi="value", properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) option_8 = StrOption(name="mode_conteneur_actif", doc="leader", multi=True, default=['non'], default_multi="non", properties=frozenset({"mandatory", "normal"})) -option_10 = StrOption(name="leader", doc="leader", multi=True) +option_10 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_11 = StrOption(name="follower1", doc="follower1", multi=True, default_multi="value", properties=frozenset({"mandatory", "normal"})) option_12 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_9 = Leadership(name="leader", doc="leader", children=[option_10, option_11, option_12], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="general", doc="general", children=[option_8, optiondescription_9], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7], properties=frozenset({"normal"})) 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_default_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py index 16696afb4..ff4747fd3 100644 --- a/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="leader", multi=True, default=['non'], default_multi="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True, default=['leader'], properties=frozenset({"mandatory"})) +option_4 = StrOption(name="leader", doc="leader", multi=True, default=['leader'], properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="follower1", doc="follower1", multi=submulti, default_multi=['value'], properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=submulti, default_multi=['value1', 'value2'], properties=frozenset({"mandatory", "normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/10load_leadership_default_submulti/tiramisu/multi.py b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/multi.py index 12a2c0e9b..f9799e0a0 100644 --- a/tests/dictionaries/10load_leadership_default_submulti/tiramisu/multi.py +++ b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/multi.py @@ -16,22 +16,27 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="leader", multi=True, default=['non'], default_multi="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True, default=['leader'], properties=frozenset({"mandatory"})) +option_4 = StrOption(name="leader", doc="leader", multi=True, default=['leader'], properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="follower1", doc="follower1", multi=submulti, default_multi=['value'], properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=submulti, default_multi=['value1', 'value2'], properties=frozenset({"mandatory", "normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) option_8 = StrOption(name="mode_conteneur_actif", doc="leader", multi=True, default=['non'], default_multi="non", properties=frozenset({"mandatory", "normal"})) -option_10 = StrOption(name="leader", doc="leader", multi=True, default=['leader'], properties=frozenset({"mandatory"})) +option_10 = StrOption(name="leader", doc="leader", multi=True, default=['leader'], properties=frozenset({"mandatory", "normal"})) option_11 = StrOption(name="follower1", doc="follower1", multi=submulti, default_multi=['value'], properties=frozenset({"mandatory", "normal"})) option_12 = StrOption(name="follower2", doc="follower2", multi=submulti, default_multi=['value1', 'value2'], properties=frozenset({"mandatory", "normal"})) optiondescription_9 = Leadership(name="leader", doc="leader", children=[option_10, option_11, option_12], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="general", doc="general", children=[option_8, optiondescription_9], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7], properties=frozenset({"normal"})) 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_defaultmulti_leader/tiramisu/base.py b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py index f7627e334..41ed41d7a 100644 --- a/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="leader", multi=True, default=['non'], default_multi="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True, default=['value'], properties=frozenset({"mandatory"})) +option_4 = StrOption(name="leader", doc="leader", multi=True, default=['value'], properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/multi.py b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/multi.py index 1dcb673b1..8f6e6ed22 100644 --- a/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/multi.py +++ b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/multi.py @@ -16,22 +16,27 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="leader", multi=True, default=['non'], default_multi="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True, default=['value'], properties=frozenset({"mandatory"})) +option_4 = StrOption(name="leader", doc="leader", multi=True, default=['value'], properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) option_8 = StrOption(name="mode_conteneur_actif", doc="leader", multi=True, default=['non'], default_multi="non", properties=frozenset({"mandatory", "normal"})) -option_10 = StrOption(name="leader", doc="leader", multi=True, default=['value'], properties=frozenset({"mandatory"})) +option_10 = StrOption(name="leader", doc="leader", multi=True, default=['value'], properties=frozenset({"mandatory", "normal"})) option_11 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"})) option_12 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_9 = Leadership(name="leader", doc="leader", children=[option_10, option_11, option_12], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="general", doc="general", children=[option_8, optiondescription_9], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7], properties=frozenset({"normal"})) 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_description/tiramisu/base.py b/tests/dictionaries/10load_leadership_description/tiramisu/base.py index 383a22a66..628b91b40 100644 --- a/tests/dictionaries/10load_leadership_description/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_description/tiramisu/base.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="other description", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8]) diff --git a/tests/dictionaries/10load_leadership_description/tiramisu/multi.py b/tests/dictionaries/10load_leadership_description/tiramisu/multi.py index 3afe2b15a..388eff47c 100644 --- a/tests/dictionaries/10load_leadership_description/tiramisu/multi.py +++ b/tests/dictionaries/10load_leadership_description/tiramisu/multi.py @@ -16,24 +16,29 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="other description", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16]) option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_8 = OptionDescription(name="general", doc="general", children=[option_9], properties=frozenset({"normal"})) -option_12 = StrOption(name="leader", doc="leader", multi=True) +option_12 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_13 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_14 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_13)))), properties=frozenset({"normal"})) optiondescription_11 = Leadership(name="leader", doc="other description", children=[option_12, option_13, option_14], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="general1", doc="general1", children=[optiondescription_11], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="2", doc="2", children=[optiondescription_18]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_17]) diff --git a/tests/dictionaries/10load_leadership_name/tiramisu/base.py b/tests/dictionaries/10load_leadership_name/tiramisu/base.py index e4c2a7257..796e87c5d 100644 --- a/tests/dictionaries/10load_leadership_name/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_name/tiramisu/base.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="other_name", doc="other_name", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8]) diff --git a/tests/dictionaries/10load_leadership_name/tiramisu/multi.py b/tests/dictionaries/10load_leadership_name/tiramisu/multi.py index 006d5e773..c772c75eb 100644 --- a/tests/dictionaries/10load_leadership_name/tiramisu/multi.py +++ b/tests/dictionaries/10load_leadership_name/tiramisu/multi.py @@ -16,24 +16,29 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6)))), properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="other_name", doc="other_name", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16]) option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_8 = OptionDescription(name="general", doc="general", children=[option_9], properties=frozenset({"normal"})) -option_12 = StrOption(name="leader", doc="leader", multi=True) +option_12 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_13 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_14 = StrOption(name="follower2", doc="follower2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_13)))), properties=frozenset({"normal"})) optiondescription_11 = Leadership(name="other_name", doc="other_name", children=[option_12, option_13, option_14], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="general1", doc="general1", children=[optiondescription_11], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="2", doc="2", children=[optiondescription_18]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_17]) diff --git a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py index 3c2873395..b9ce7fa94 100644 --- a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=submulti, default=[Calculation(func.calc_val, Params((ParamOption(option_6))))], properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8]) diff --git a/tests/dictionaries/10load_leadership_submulti/tiramisu/multi.py b/tests/dictionaries/10load_leadership_submulti/tiramisu/multi.py index ee2586c3e..6c0fdbe5c 100644 --- a/tests/dictionaries/10load_leadership_submulti/tiramisu/multi.py +++ b/tests/dictionaries/10load_leadership_submulti/tiramisu/multi.py @@ -16,24 +16,29 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -option_5 = StrOption(name="leader", doc="leader", multi=True) +option_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_7 = StrOption(name="follower2", doc="follower2", multi=submulti, default=[Calculation(func.calc_val, Params((ParamOption(option_6))))], properties=frozenset({"normal"})) optiondescription_4 = Leadership(name="leader", doc="leader", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general1", doc="general1", children=[optiondescription_4], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16]) option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_8 = OptionDescription(name="general", doc="general", children=[option_9], properties=frozenset({"normal"})) -option_12 = StrOption(name="leader", doc="leader", multi=True) +option_12 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_13 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) option_14 = StrOption(name="follower2", doc="follower2", multi=submulti, default=[Calculation(func.calc_val, Params((ParamOption(option_13))))], properties=frozenset({"normal"})) optiondescription_11 = Leadership(name="leader", doc="leader", children=[option_12, option_13, option_14], properties=frozenset({"normal"})) optiondescription_10 = OptionDescription(name="general1", doc="general1", children=[optiondescription_11], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8, optiondescription_10], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="2", doc="2", children=[optiondescription_18]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_17]) diff --git a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py index c1a487725..1b970502b 100644 --- a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py +++ b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 c2115591f..ed04115fa 100644 --- a/tests/dictionaries/10load_mandatoryifin/tiramisu/multi.py +++ b/tests/dictionaries/10load_mandatoryifin/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_mandatoryifnotin_noexist/tiramisu/base.py b/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/base.py index 39ae5b3bc..ddcf2b0c3 100644 --- a/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/base.py +++ b/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/multi.py b/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/multi.py index 37c42785e..b53f41ee6 100644 --- a/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/multi.py +++ b/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_8 = StrOption(name="mode_conteneur_actif2", 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, option_7, option_8], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/10load_multivalue/tiramisu/base.py b/tests/dictionaries/10load_multivalue/tiramisu/base.py index 77b19aa36..e8b42c29d 100644 --- a/tests/dictionaries/10load_multivalue/tiramisu/base.py +++ b/tests/dictionaries/10load_multivalue/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", multi=True, default=['non', 'oui'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/10load_multivalue/tiramisu/multi.py b/tests/dictionaries/10load_multivalue/tiramisu/multi.py index 1e00ba11a..e6ede54c8 100644 --- a/tests/dictionaries/10load_multivalue/tiramisu/multi.py +++ b/tests/dictionaries/10load_multivalue/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", multi=True, default=['non', 'oui'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", multi=True, default=['non', 'oui'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/10valid_enum_accent/tiramisu/base.py b/tests/dictionaries/10valid_enum_accent/tiramisu/base.py index 9bf9bca5b..80e047c4c 100644 --- a/tests/dictionaries/10valid_enum_accent/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_accent/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c', 'é'), default="c", properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10valid_enum_accent/tiramisu/multi.py b/tests/dictionaries/10valid_enum_accent/tiramisu/multi.py index 5ecce0482..bda775260 100644 --- a/tests/dictionaries/10valid_enum_accent/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_accent/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c', 'é'), default="c", properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"expert"})) option_8 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c', 'é'), default="c", properties=frozenset({"expert", "mandatory"})) option_8.impl_set_information('help', "bla bla bla") optiondescription_7 = OptionDescription(name="enumfam", doc="enumfam", children=[option_8], properties=frozenset({"expert"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"expert"})) 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/10valid_enum_append/tiramisu/base.py b/tests/dictionaries/10valid_enum_append/tiramisu/base.py index 2e96f406c..95be6fc86 100644 --- a/tests/dictionaries/10valid_enum_append/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_append/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c'), default="c", properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10valid_enum_append/tiramisu/multi.py b/tests/dictionaries/10valid_enum_append/tiramisu/multi.py index 1676f1f60..96e055d89 100644 --- a/tests/dictionaries/10valid_enum_append/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_append/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c'), default="c", properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"expert"})) option_8 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c'), default="c", properties=frozenset({"expert", "mandatory"})) option_8.impl_set_information('help', "bla bla bla") optiondescription_7 = OptionDescription(name="enumfam", doc="enumfam", children=[option_8], properties=frozenset({"expert"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"expert"})) 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/10valid_enum_base/tiramisu/base.py b/tests/dictionaries/10valid_enum_base/tiramisu/base.py index 2e96f406c..95be6fc86 100644 --- a/tests/dictionaries/10valid_enum_base/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_base/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c'), default="c", properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10valid_enum_base/tiramisu/multi.py b/tests/dictionaries/10valid_enum_base/tiramisu/multi.py index 1676f1f60..96e055d89 100644 --- a/tests/dictionaries/10valid_enum_base/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_base/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c'), default="c", properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"expert"})) option_8 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c'), default="c", properties=frozenset({"expert", "mandatory"})) option_8.impl_set_information('help', "bla bla bla") optiondescription_7 = OptionDescription(name="enumfam", doc="enumfam", children=[option_8], properties=frozenset({"expert"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"expert"})) 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/10valid_enum_base_no_mandatory/tiramisu/base.py b/tests/dictionaries/10valid_enum_base_no_mandatory/tiramisu/base.py index d192ed27f..18814eb7f 100644 --- a/tests/dictionaries/10valid_enum_base_no_mandatory/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_base_no_mandatory/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="enumvar", values=('a', 'b', 'c', None), default="c", properties=frozenset({"expert"})) optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10valid_enum_base_no_mandatory/tiramisu/multi.py b/tests/dictionaries/10valid_enum_base_no_mandatory/tiramisu/multi.py index efd0d69bc..83b4dfcad 100644 --- a/tests/dictionaries/10valid_enum_base_no_mandatory/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_base_no_mandatory/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="enumvar", values=('a', 'b', 'c', None), default="c", properties=frozenset({"expert"})) optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"expert"})) option_8 = ChoiceOption(name="enumvar", doc="enumvar", values=('a', 'b', 'c', None), default="c", properties=frozenset({"expert"})) optiondescription_7 = OptionDescription(name="enumfam", doc="enumfam", children=[option_8], properties=frozenset({"expert"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"expert"})) 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/10valid_enum_base_redefine/tiramisu/base.py b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py index af61a5f93..ae1aa21a1 100644 --- a/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar2", doc="multi", values=('a', 'b', 'c'), default="c", properties=frozenset({"expert", "mandatory"})) option_5 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'c'), default="c", properties=frozenset({"expert", "mandatory"})) option_5.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4, option_5], properties=frozenset({"expert"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/10valid_enum_base_redefine/tiramisu/multi.py b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/multi.py index d6e8fbce5..c80da4e5b 100644 --- a/tests/dictionaries/10valid_enum_base_redefine/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/multi.py @@ -16,15 +16,20 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar2", doc="multi", values=('a', 'b', 'c'), default="c", properties=frozenset({"expert", "mandatory"})) option_5 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'c'), default="c", properties=frozenset({"expert", "mandatory"})) option_5.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4, option_5], properties=frozenset({"expert"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12]) option_7 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_6 = OptionDescription(name="general", doc="general", children=[option_7], properties=frozenset({"expert"})) @@ -32,6 +37,6 @@ option_9 = ChoiceOption(name="enumvar2", doc="multi", values=('a', 'b', 'c'), de option_10 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'c'), default="c", properties=frozenset({"expert", "mandatory"})) option_10.impl_set_information('help', "bla bla bla") optiondescription_8 = OptionDescription(name="enumfam", doc="enumfam", children=[option_9, option_10], properties=frozenset({"expert"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6, optiondescription_8]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6, optiondescription_8], properties=frozenset({"expert"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/10valid_enum_leader/tiramisu/base.py b/tests/dictionaries/10valid_enum_leader/tiramisu/base.py index 1100d2ce0..8312442bf 100644 --- a/tests/dictionaries/10valid_enum_leader/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_leader/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_5 = ChoiceOption(name="follower1", doc="follower1", values=('a', 'b', 'c'), multi=True, default_multi="a", properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/10valid_enum_leader/tiramisu/multi.py b/tests/dictionaries/10valid_enum_leader/tiramisu/multi.py index c389f60af..ef5b09d74 100644 --- a/tests/dictionaries/10valid_enum_leader/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_leader/tiramisu/multi.py @@ -16,22 +16,27 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_5 = ChoiceOption(name="follower1", doc="follower1", values=('a', 'b', 'c'), multi=True, default_multi="a", properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) option_8 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_10 = StrOption(name="leader", doc="leader", multi=True) +option_10 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_11 = ChoiceOption(name="follower1", doc="follower1", values=('a', 'b', 'c'), multi=True, default_multi="a", properties=frozenset({"mandatory", "normal"})) option_12 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_9 = Leadership(name="leader", doc="leader", children=[option_10, option_11, option_12], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="general", doc="general", children=[option_8, optiondescription_9], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7], properties=frozenset({"normal"})) 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/10valid_enum_mandatory/tiramisu/base.py b/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py index 176c3b9d6..14c7a03e7 100644 --- a/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c'), default="a", properties=frozenset({"expert", "mandatory"})) optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10valid_enum_mandatory/tiramisu/multi.py b/tests/dictionaries/10valid_enum_mandatory/tiramisu/multi.py index 9a247632b..f34b92385 100644 --- a/tests/dictionaries/10valid_enum_mandatory/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_mandatory/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c'), default="a", properties=frozenset({"expert", "mandatory"})) optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"expert"})) option_8 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c'), default="a", properties=frozenset({"expert", "mandatory"})) optiondescription_7 = OptionDescription(name="enumfam", doc="enumfam", children=[option_8], properties=frozenset({"expert"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"expert"})) 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/10valid_enum_multi/tiramisu/base.py b/tests/dictionaries/10valid_enum_multi/tiramisu/base.py index 1dd32d682..8850ec26b 100644 --- a/tests/dictionaries/10valid_enum_multi/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_multi/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = ChoiceOption(name="multi", doc="multi", values=('a', 'b', 'c'), multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/10valid_enum_multi/tiramisu/multi.py b/tests/dictionaries/10valid_enum_multi/tiramisu/multi.py index 595035e06..fab9931f2 100644 --- a/tests/dictionaries/10valid_enum_multi/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_multi/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = ChoiceOption(name="multi", doc="multi", values=('a', 'b', 'c'), multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_6 = ChoiceOption(name="multi", doc="multi", values=('a', 'b', 'c'), multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/10valid_enum_none/tiramisu/base.py b/tests/dictionaries/10valid_enum_none/tiramisu/base.py index f85f8ecd9..7c3a52b96 100644 --- a/tests/dictionaries/10valid_enum_none/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_none/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', None), default="b", properties=frozenset({"expert"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10valid_enum_none/tiramisu/multi.py b/tests/dictionaries/10valid_enum_none/tiramisu/multi.py index 8d09ea901..bcfb7836f 100644 --- a/tests/dictionaries/10valid_enum_none/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_none/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', None), default="b", properties=frozenset({"expert"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"expert"})) option_8 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', None), default="b", properties=frozenset({"expert"})) option_8.impl_set_information('help', "bla bla bla") optiondescription_7 = OptionDescription(name="enumfam", doc="enumfam", children=[option_8], properties=frozenset({"expert"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"expert"})) 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/10valid_enum_number/tiramisu/base.py b/tests/dictionaries/10valid_enum_number/tiramisu/base.py index 19c62f1db..4505d9b8c 100644 --- a/tests/dictionaries/10valid_enum_number/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_number/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="enumvar", values=(1, 2, 3), default=1, properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10valid_enum_number/tiramisu/multi.py b/tests/dictionaries/10valid_enum_number/tiramisu/multi.py index 036dfb8a7..4a52c4abb 100644 --- a/tests/dictionaries/10valid_enum_number/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_number/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="enumvar", values=(1, 2, 3), default=1, properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"expert"})) option_8 = ChoiceOption(name="enumvar", doc="enumvar", values=(1, 2, 3), default=1, properties=frozenset({"expert", "mandatory"})) option_8.impl_set_information('help', "bla bla bla") optiondescription_7 = OptionDescription(name="enumfam", doc="enumfam", children=[option_8], properties=frozenset({"expert"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"expert"})) 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/10valid_enum_numberdefault/tiramisu/base.py b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py index 1aaf6aeb6..c097f01c8 100644 --- a/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="enumvar", values=(1, 2, 3), default=3, properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10valid_enum_numberdefault/tiramisu/multi.py b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/multi.py index 6a30bd7b9..7fbfa4a36 100644 --- a/tests/dictionaries/10valid_enum_numberdefault/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="enumvar", values=(1, 2, 3), default=3, properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"expert"})) option_8 = ChoiceOption(name="enumvar", doc="enumvar", values=(1, 2, 3), default=3, properties=frozenset({"expert", "mandatory"})) option_8.impl_set_information('help', "bla bla bla") optiondescription_7 = OptionDescription(name="enumfam", doc="enumfam", children=[option_8], properties=frozenset({"expert"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"expert"})) 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/10valid_enum_param_empty/tiramisu/base.py b/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py index 46f0ca02e..76ec9b848 100644 --- a/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = ChoiceOption(name="enumvar", doc="multi", values=(None,), properties=frozenset({"expert"})) option_2.impl_set_information('help', "bla bla bla") optiondescription_1 = OptionDescription(name="enumfam", doc="enumfam", children=[option_2], properties=frozenset({"expert"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/10valid_enum_param_empty/tiramisu/multi.py b/tests/dictionaries/10valid_enum_param_empty/tiramisu/multi.py index cd4d1ce77..099d66d78 100644 --- a/tests/dictionaries/10valid_enum_param_empty/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_param_empty/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = ChoiceOption(name="enumvar", doc="multi", values=(None,), properties=frozenset({"expert"})) option_2.impl_set_information('help', "bla bla bla") optiondescription_1 = OptionDescription(name="enumfam", doc="enumfam", children=[option_2], properties=frozenset({"expert"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"expert"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = ChoiceOption(name="enumvar", doc="multi", values=(None,), properties=frozenset({"expert"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"expert"})) 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/10valid_enum_param_empty2/tiramisu/base.py b/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py index 245ad1b52..98d2b94f9 100644 --- a/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=(None,), properties=frozenset({"expert"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10valid_enum_param_empty2/tiramisu/multi.py b/tests/dictionaries/10valid_enum_param_empty2/tiramisu/multi.py index d98d94bd4..dc1d341c9 100644 --- a/tests/dictionaries/10valid_enum_param_empty2/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_param_empty2/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=(None,), properties=frozenset({"expert"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"expert"})) option_8 = ChoiceOption(name="enumvar", doc="multi", values=(None,), properties=frozenset({"expert"})) option_8.impl_set_information('help', "bla bla bla") optiondescription_7 = OptionDescription(name="enumfam", doc="enumfam", children=[option_8], properties=frozenset({"expert"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"expert"})) 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/10valid_enum_quote/tiramisu/base.py b/tests/dictionaries/10valid_enum_quote/tiramisu/base.py index ef3315986..54d0604d9 100644 --- a/tests/dictionaries/10valid_enum_quote/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_quote/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=("quote'", 'quote"', 'quote"\''), default="quote'", properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/10valid_enum_quote/tiramisu/multi.py b/tests/dictionaries/10valid_enum_quote/tiramisu/multi.py index 5f3fb0719..e3c12baf0 100644 --- a/tests/dictionaries/10valid_enum_quote/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_quote/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = ChoiceOption(name="enumvar", doc="multi", values=("quote'", 'quote"', 'quote"\''), default="quote'", properties=frozenset({"expert", "mandatory"})) option_4.impl_set_information('help', "bla bla bla") optiondescription_3 = OptionDescription(name="enumfam", doc="enumfam", children=[option_4], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"expert"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"expert"})) option_8 = ChoiceOption(name="enumvar", doc="multi", values=("quote'", 'quote"', 'quote"\''), default="quote'", properties=frozenset({"expert", "mandatory"})) option_8.impl_set_information('help', "bla bla bla") optiondescription_7 = OptionDescription(name="enumfam", doc="enumfam", children=[option_8], properties=frozenset({"expert"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"expert"})) 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/10valid_enum_value/tiramisu/base.py b/tests/dictionaries/10valid_enum_value/tiramisu/base.py index abd46b2db..63f46edfa 100644 --- a/tests/dictionaries/10valid_enum_value/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_value/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = ChoiceOption(name="mode_conteneur_actif", doc="No change", values=('a', 'b', 'c'), default="b", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/10valid_enum_value/tiramisu/multi.py b/tests/dictionaries/10valid_enum_value/tiramisu/multi.py index 61a62961c..1ad4a9d05 100644 --- a/tests/dictionaries/10valid_enum_value/tiramisu/multi.py +++ b/tests/dictionaries/10valid_enum_value/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = ChoiceOption(name="mode_conteneur_actif", doc="No change", values=('a', 'b', 'c'), default="b", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = ChoiceOption(name="mode_conteneur_actif", doc="No change", values=('a', 'b', 'c'), default="b", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/11disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py index 253d34e85..5eb0998fd 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = 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("oui")}))) diff --git a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/multi.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/multi.py index 0c471b679..1b93e13c5 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/multi.py +++ b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/multi.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/etc/file") option_14 = StrOption(name="source", doc="source", default="file") option_12 = 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("oui")}))) @@ -38,7 +43,7 @@ option_6 = StrOption(name="condition", doc="No change", default="non", propertie 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]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/etc/file") option_21 = StrOption(name="source", doc="source", default="file") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue("oui")}))) diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/base.py index 438438b4f..684e94587 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_8 = StrOption(name="source", doc="source", default="file1") option_6 = 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(True)}))) diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/multi.py b/tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/multi.py index 7bfad8e09..d6644fcf8 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/multi.py +++ b/tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_10 = StrOption(name="source", doc="source", default="file1") option_8 = 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(True)}))) @@ -34,7 +39,7 @@ optiondescription_21 = OptionDescription(name="services", doc="services", childr optiondescription_19 = OptionDescription(name="1", doc="1", children=[optiondescription_20, optiondescription_21]) option_4 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_16 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_17 = StrOption(name="source", doc="source", default="file1") option_15 = 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(True)}))) diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/base.py index e172c06a6..b58a776e6 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = BoolOption(name="condition", doc="condition", default=False, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_8 = StrOption(name="source", doc="source", default="file1") option_6 = 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(True)}))) diff --git a/tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/multi.py b/tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/multi.py index f0d4c331d..de38d9f2f 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/multi.py +++ b/tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = BoolOption(name="condition", doc="condition", default=False, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_10 = StrOption(name="source", doc="source", default="file1") option_8 = 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(True)}))) @@ -34,7 +39,7 @@ optiondescription_21 = OptionDescription(name="services", doc="services", childr optiondescription_19 = OptionDescription(name="1", doc="1", children=[optiondescription_20, optiondescription_21]) option_4 = BoolOption(name="condition", doc="condition", default=False, properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_16 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_17 = StrOption(name="source", doc="source", default="file1") option_15 = 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(True)}))) 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 554858738..5c4c83c2f 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = 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("oui")}))) 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 3eb5c9993..1d686ede8 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/multi.py +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/multi.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/etc/file") option_14 = StrOption(name="source", doc="source", default="file") option_12 = 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("oui")}))) @@ -38,7 +43,7 @@ option_6 = StrOption(name="condition", doc="No change", default="oui", propertie 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]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/etc/file") option_21 = StrOption(name="source", doc="source", default="file") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue("oui")}))) 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 9c79e454e..6e04463b3 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_10 = StrOption(name="source", doc="source", default="file1") option_8 = 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("oui")}))) 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 827ddd4a5..91dbf827f 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/multi.py +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/multi.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_14 = StrOption(name="source", doc="source", default="file1") option_12 = 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("oui")}))) @@ -42,7 +47,7 @@ option_6 = StrOption(name="condition", doc="No change", default="non", propertie 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]) +optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_24 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_25 = StrOption(name="source", doc="source", default="file1") option_23 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue("oui")}))) 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 253d34e85..5eb0998fd 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = 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("oui")}))) 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 0c471b679..1b93e13c5 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 @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/etc/file") option_14 = StrOption(name="source", doc="source", default="file") option_12 = 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("oui")}))) @@ -38,7 +43,7 @@ option_6 = StrOption(name="condition", doc="No change", default="non", propertie 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]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/etc/file") option_21 = StrOption(name="source", doc="source", default="file") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue("oui")}))) diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py index 0ba7a1789..7192be2f3 100644 --- a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = 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("unpossible"), 'reverse_condition_0': ParamValue(True)}))) diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/multi.py b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/multi.py index fa6abb544..a29c14de5 100644 --- a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/multi.py +++ b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/multi.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file") option_14 = StrOption(name="source", doc="source", default="file") option_12 = 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("unpossible"), 'reverse_condition_0': ParamValue(True)}))) @@ -38,7 +43,7 @@ option_6 = StrOption(name="condition", doc="No change", default="non", propertie 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="mode_conteneur_actif2", 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, option_7, option_8], properties=frozenset({"normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file") option_21 = StrOption(name="source", doc="source", default="file") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True)}))) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py index 0ba7a1789..7192be2f3 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = 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("unpossible"), 'reverse_condition_0': ParamValue(True)}))) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/multi.py b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/multi.py index fa6abb544..a29c14de5 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/multi.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/multi.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file") option_14 = StrOption(name="source", doc="source", default="file") option_12 = 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("unpossible"), 'reverse_condition_0': ParamValue(True)}))) @@ -38,7 +43,7 @@ option_6 = StrOption(name="condition", doc="No change", default="non", propertie 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="mode_conteneur_actif2", 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, option_7, option_8], properties=frozenset({"normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file") option_21 = StrOption(name="source", doc="source", default="file") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True)}))) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py index 4068a8b61..9f0b6b40b 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = 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("unpossible"), 'reverse_condition_0': ParamValue(True), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue("oui"), 'reverse_condition_1': ParamValue(True), 'condition_operator': ParamValue("OR")}))) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/multi.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/multi.py index 098a33540..c5537d8f7 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/multi.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/multi.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file") option_14 = StrOption(name="source", doc="source", default="file") option_12 = 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("unpossible"), 'reverse_condition_0': ParamValue(True), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue("oui"), 'reverse_condition_1': ParamValue(True), 'condition_operator': ParamValue("OR")}))) @@ -38,7 +43,7 @@ option_6 = StrOption(name="condition", doc="No change", default="non", propertie 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="mode_conteneur_actif2", 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, option_7, option_8], properties=frozenset({"normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file") option_21 = StrOption(name="source", doc="source", default="file") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True), 'condition_1': ParamOption(option_8, notraisepropertyerror=True), 'expected_1': ParamValue("oui"), 'reverse_condition_1': ParamValue(True), 'condition_operator': ParamValue("OR")}))) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py index edbe44b46..f1f349fa7 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = ChoiceOption(name="condition", doc="No change", values=('non', 'statique'), 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"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/tmp/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = 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("statique"), 'reverse_condition_0': ParamValue(True)}))) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/multi.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/multi.py index dd0e0946d..7a91f5897 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/multi.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/multi.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = ChoiceOption(name="condition", doc="No change", values=('non', 'statique'), 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"})) option_4 = StrOption(name="mode_conteneur_actif2", 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, option_3, option_4], properties=frozenset({"normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = FilenameOption(name="name", doc="name", default="/tmp/file") option_14 = StrOption(name="source", doc="source", default="file") option_12 = 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("statique"), 'reverse_condition_0': ParamValue(True)}))) @@ -38,7 +43,7 @@ option_6 = ChoiceOption(name="condition", doc="No change", values=('non', 'stati 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="mode_conteneur_actif2", 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, option_7, option_8], properties=frozenset({"normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/tmp/file") option_21 = StrOption(name="source", doc="source", default="file") option_19 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_6, notraisepropertyerror=True), 'expected_0': ParamValue("statique"), 'reverse_condition_0': ParamValue(True)}))) diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py index 5c86731ee..9f4164b6e 100644 --- a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_8 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_9 = StrOption(name="source", doc="source", default="file1") option_7 = BoolOption(name="activate", doc="activate", default=False) diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/multi.py b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/multi.py index 3d6185a06..e7a38ca4b 100644 --- a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/multi.py +++ b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/multi.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_11 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_12 = StrOption(name="source", doc="source", default="file1") option_10 = BoolOption(name="activate", doc="activate", default=False) @@ -36,7 +41,7 @@ optiondescription_21 = OptionDescription(name="1", doc="1", children=[optiondesc option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_6 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) option_18 = FilenameOption(name="name", doc="name", default="/tmp/file1") option_19 = StrOption(name="source", doc="source", default="file1") option_17 = BoolOption(name="activate", doc="activate", default=False) diff --git a/tests/dictionaries/11valid_enum_function/tiramisu/base.py b/tests/dictionaries/11valid_enum_function/tiramisu/base.py index 309bab3a9..29fbcabec 100644 --- a/tests/dictionaries/11valid_enum_function/tiramisu/base.py +++ b/tests/dictionaries/11valid_enum_function/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = ChoiceOption(name="var", doc="New variable", values=Calculation(func.trange, Params((ParamValue(0), ParamValue(10)))), default=9, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/11valid_enum_function/tiramisu/multi.py b/tests/dictionaries/11valid_enum_function/tiramisu/multi.py index 088f6fb9a..babe7634a 100644 --- a/tests/dictionaries/11valid_enum_function/tiramisu/multi.py +++ b/tests/dictionaries/11valid_enum_function/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = ChoiceOption(name="var", doc="New variable", values=Calculation(func.trange, Params((ParamValue(0), ParamValue(10)))), default=9, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = ChoiceOption(name="var", doc="New variable", values=Calculation(func.trange, Params((ParamValue(0), ParamValue(10)))), default=9, properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/11valid_enum_variable/tiramisu/base.py b/tests/dictionaries/11valid_enum_variable/tiramisu/base.py index f0b05e54d..83c8b92e0 100644 --- a/tests/dictionaries/11valid_enum_variable/tiramisu/base.py +++ b/tests/dictionaries/11valid_enum_variable/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="var", doc="New variable", multi=True, default=['a', 'b', 'c'], default_multi="a", properties=frozenset({"mandatory", "normal"})) option_2 = ChoiceOption(name="mode_conteneur_actif", doc="No change", values=Calculation(func.calc_value, Params((ParamOption(option_3)))), default="a", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/11valid_enum_variable/tiramisu/multi.py b/tests/dictionaries/11valid_enum_variable/tiramisu/multi.py index 3b4b2f00d..f375bb3e9 100644 --- a/tests/dictionaries/11valid_enum_variable/tiramisu/multi.py +++ b/tests/dictionaries/11valid_enum_variable/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="var", doc="New variable", multi=True, default=['a', 'b', 'c'], default_multi="a", properties=frozenset({"mandatory", "normal"})) option_2 = ChoiceOption(name="mode_conteneur_actif", doc="No change", values=Calculation(func.calc_value, Params((ParamOption(option_3)))), default="a", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_6 = StrOption(name="var", doc="New variable", multi=True, default=['a', 'b', 'c'], default_multi="a", properties=frozenset({"mandatory", "normal"})) option_5 = ChoiceOption(name="mode_conteneur_actif", doc="No change", values=Calculation(func.calc_value, Params((ParamOption(option_6)))), default="a", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/20family_append/tiramisu/base.py b/tests/dictionaries/20family_append/tiramisu/base.py index 419efca2e..e7c85c725 100644 --- a/tests/dictionaries/20family_append/tiramisu/base.py +++ b/tests/dictionaries/20family_append/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", 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, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/20family_append/tiramisu/multi.py b/tests/dictionaries/20family_append/tiramisu/multi.py index 1dcbc9718..56228fb10 100644 --- a/tests/dictionaries/20family_append/tiramisu/multi.py +++ b/tests/dictionaries/20family_append/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", 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, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_6 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/20family_disabled/tiramisu/base.py b/tests/dictionaries/20family_disabled/tiramisu/base.py index a9c1f8b86..0048775f7 100644 --- a/tests/dictionaries/20family_disabled/tiramisu/base.py +++ b/tests/dictionaries/20family_disabled/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"disabled", "normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/20family_disabled/tiramisu/multi.py b/tests/dictionaries/20family_disabled/tiramisu/multi.py index 2bbe4442a..318c2160e 100644 --- a/tests/dictionaries/20family_disabled/tiramisu/multi.py +++ b/tests/dictionaries/20family_disabled/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"disabled", "normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"disabled", "normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/20family_disabled/yml/00-base.yml b/tests/dictionaries/20family_disabled/yml/00-base.yml index aeb28e4f3..94bbbc55b 100644 --- a/tests/dictionaries/20family_disabled/yml/00-base.yml +++ b/tests/dictionaries/20family_disabled/yml/00-base.yml @@ -2,6 +2,7 @@ version: '0.10' variables: - family: - name: general + disabled: true variables: - variable: - name: mode_conteneur_actif diff --git a/tests/dictionaries/20family_dynamic/tiramisu/base.py b/tests/dictionaries/20family_dynamic/tiramisu/base.py index 9850b721c..ec11f2e16 100644 --- a/tests/dictionaries/20family_dynamic/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/20family_dynamic/tiramisu/multi.py b/tests/dictionaries/20family_dynamic/tiramisu/multi.py index 775db6bd6..8f4723e66 100644 --- a/tests/dictionaries/20family_dynamic/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic/tiramisu/multi.py @@ -16,19 +16,24 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"normal"})) option_8 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) optiondescription_7 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_6, notraisepropertyerror=True)))), children=[option_8], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"normal"})) 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/20family_dynamic_calc/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py index db972ed58..6017207a3 100644 --- a/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) @@ -25,5 +30,5 @@ option_4 = StrOption(name="vardyn", doc="No change", default="val", properties=f optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) option_6 = StrOption(name="newvar", doc="No change", default=Calculation(func.calc_val, Params((ParamDynOption(option_4, 'val1', optiondescription_3)))), properties=frozenset({"normal"})) 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]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3, optiondescription_5], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/20family_dynamic_calc/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_calc/tiramisu/multi.py index 3ec55efd0..7f350e073 100644 --- a/tests/dictionaries/20family_dynamic_calc/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_calc/tiramisu/multi.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) @@ -25,7 +30,7 @@ option_4 = StrOption(name="vardyn", doc="No change", default="val", properties=f optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) option_6 = StrOption(name="newvar", doc="No change", default=Calculation(func.calc_val, Params((ParamDynOption(option_4, 'val1', optiondescription_3)))), properties=frozenset({"normal"})) 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3, optiondescription_5], properties=frozenset({"normal"})) 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"})) @@ -33,6 +38,6 @@ option_10 = StrOption(name="vardyn", doc="No change", default="val", properties= optiondescription_9 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_8, notraisepropertyerror=True)))), children=[option_10], properties=frozenset({"normal"})) option_12 = StrOption(name="newvar", doc="No change", default=Calculation(func.calc_val, Params((ParamDynOption(option_10, 'val1', optiondescription_9)))), properties=frozenset({"normal"})) 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_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7, optiondescription_9, optiondescription_11], properties=frozenset({"normal"})) 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/20family_dynamic_calc2/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py index 838307760..963dece54 100644 --- a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) @@ -25,5 +30,5 @@ option_6 = StrOption(name="newvar", doc="No change", properties=frozenset({"norm 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]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3, optiondescription_5], properties=frozenset({"normal"})) 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 518f84da6..8d6949b3a 100644 --- a/tests/dictionaries/20family_dynamic_calc2/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_calc2/tiramisu/multi.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) @@ -25,7 +30,7 @@ option_6 = StrOption(name="newvar", doc="No change", properties=frozenset({"norm 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3, optiondescription_5], properties=frozenset({"normal"})) 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"})) @@ -33,6 +38,6 @@ option_12 = StrOption(name="newvar", doc="No change", properties=frozenset({"nor 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_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7, optiondescription_9, optiondescription_11], properties=frozenset({"normal"})) 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/20family_dynamic_calc_suffix/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py index 63ed2dfbc..4f2983b98 100644 --- a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) @@ -25,5 +30,5 @@ option_4 = StrOption(name="vardyn", doc="No change", default=Calculation(func.ca optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) option_6 = StrOption(name="newvar", doc="No change", properties=frozenset({"normal"})) 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]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3, optiondescription_5], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/multi.py index 2bfbed7c4..a71a1f251 100644 --- a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/multi.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) @@ -25,7 +30,7 @@ option_4 = StrOption(name="vardyn", doc="No change", default=Calculation(func.ca optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) option_6 = StrOption(name="newvar", doc="No change", properties=frozenset({"normal"})) 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3, optiondescription_5], properties=frozenset({"normal"})) 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"})) @@ -33,6 +38,6 @@ option_10 = StrOption(name="vardyn", doc="No change", default=Calculation(func.c optiondescription_9 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_8, notraisepropertyerror=True)))), children=[option_10], properties=frozenset({"normal"})) option_12 = StrOption(name="newvar", doc="No change", properties=frozenset({"normal"})) 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_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7, optiondescription_9, optiondescription_11], properties=frozenset({"normal"})) 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/20family_dynamic_description/tiramisu/base.py b/tests/dictionaries/20family_dynamic_description/tiramisu/base.py index cab19743a..7f9864f9b 100644 --- a/tests/dictionaries/20family_dynamic_description/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_description/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="Dyn ", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/20family_dynamic_description/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_description/tiramisu/multi.py index 40b8e205c..af0947212 100644 --- a/tests/dictionaries/20family_dynamic_description/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_description/tiramisu/multi.py @@ -16,19 +16,24 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="Dyn ", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"normal"})) option_8 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) optiondescription_7 = ConvertDynOptionDescription(name="dyn", doc="Dyn ", suffixes=Calculation(func.calc_value, Params((ParamOption(option_6, notraisepropertyerror=True)))), children=[option_8], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"normal"})) 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/20family_dynamic_jinja_fill/__init__.py b/tests/dictionaries/20family_dynamic_jinja_fill/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/20family_dynamic_jinja_fill/makedict/after.json b/tests/dictionaries/20family_dynamic_jinja_fill/makedict/after.json new file mode 100644 index 000000000..6bc6e807c --- /dev/null +++ b/tests/dictionaries/20family_dynamic_jinja_fill/makedict/after.json @@ -0,0 +1,21 @@ +{ + "rougail.general.varname": { + "owner": "default", + "value": [ + "val1", + "val2" + ] + }, + "rougail.dynval1.vardynval1": { + "owner": "default", + "value": "val" + }, + "rougail.dynval2.vardynval2": { + "owner": "default", + "value": "val" + }, + "rougail.new.newvar": { + "owner": "default", + "value": "val" + } +} diff --git a/tests/dictionaries/20family_dynamic_jinja_fill/makedict/base.json b/tests/dictionaries/20family_dynamic_jinja_fill/makedict/base.json new file mode 100644 index 000000000..9b99cc844 --- /dev/null +++ b/tests/dictionaries/20family_dynamic_jinja_fill/makedict/base.json @@ -0,0 +1,9 @@ +{ + "rougail.general.varname": [ + "val1", + "val2" + ], + "rougail.dynval1.vardynval1": "val", + "rougail.dynval2.vardynval2": "val", + "rougail.new.newvar": "val" +} diff --git a/tests/dictionaries/20family_dynamic_jinja_fill/makedict/before.json b/tests/dictionaries/20family_dynamic_jinja_fill/makedict/before.json new file mode 100644 index 000000000..6bc6e807c --- /dev/null +++ b/tests/dictionaries/20family_dynamic_jinja_fill/makedict/before.json @@ -0,0 +1,21 @@ +{ + "rougail.general.varname": { + "owner": "default", + "value": [ + "val1", + "val2" + ] + }, + "rougail.dynval1.vardynval1": { + "owner": "default", + "value": "val" + }, + "rougail.dynval2.vardynval2": { + "owner": "default", + "value": "val" + }, + "rougail.new.newvar": { + "owner": "default", + "value": "val" + } +} diff --git a/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/base.py b/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/base.py new file mode 100644 index 000000000..ee8344f44 --- /dev/null +++ b/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/base.py @@ -0,0 +1,64 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['rougail.new.newvar'] = "{{ vardynval1 }}" +from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +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_4 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal"})) +optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) +option_6 = StrOption(name="newvar", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("rougail.new.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'vardynval1': ParamDynOption(option_4, 'val1', optiondescription_3)})), properties=frozenset({"normal"})) +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], properties=frozenset({"normal"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/multi.py new file mode 100644 index 000000000..162505877 --- /dev/null +++ b/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/multi.py @@ -0,0 +1,74 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +from jinja2 import StrictUndefined, DictLoader +from jinja2.sandbox import SandboxedEnvironment +from rougail.annotator.variable import CONVERT_OPTION +def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): + kw = {} + for key, value in kwargs.items(): + if '.' in key: + c_kw = kw + path, var = key.rsplit('.', 1) + for subkey in path.split('.'): + c_kw = c_kw.setdefault(subkey, {}) + c_kw[var] = value + else: + kw[key] = value + values = ENV.get_template(__internal_jinja).render(kw) + convert = CONVERT_OPTION[__internal_type].get('func', str) + if __internal_multi: + return [convert(val) for val in values.split(',')] + return convert(values) +def valid_with_jinja(value, **kwargs): + kwargs[kwargs.pop('__internal_key')] = value + value = jinja_to_function(__internal_type='string', __internal_multi=False, **kwargs) + if value: + raise ValueError(value) +func.jinja_to_function = jinja_to_function +func.valid_with_jinja = valid_with_jinja +dict_env = {} +dict_env['1.rougail.new.newvar'] = "{{ vardynval1 }}" +dict_env['2.rougail.new.newvar'] = "{{ vardynval1 }}" +from rougail.tiramisu import ConvertDynOptionDescription +ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined) +ENV.compile_templates('jinja_caches', zip=None) +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_4 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal"})) +optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) +option_6 = StrOption(name="newvar", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("1.rougail.new.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'vardynval1': ParamDynOption(option_4, 'val1', optiondescription_3)})), properties=frozenset({"normal"})) +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], properties=frozenset({"normal"})) +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_10 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal"})) +optiondescription_9 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_8, notraisepropertyerror=True)))), children=[option_10], properties=frozenset({"normal"})) +option_12 = StrOption(name="newvar", doc="No change", default=Calculation(func.jinja_to_function, Params((), kwargs={'__internal_jinja': ParamValue("2.rougail.new.newvar"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'vardynval1': ParamDynOption(option_10, 'val1', optiondescription_9)})), properties=frozenset({"normal"})) +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], properties=frozenset({"normal"})) +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/20family_dynamic_jinja_fill/xml/00-base.xml b/tests/dictionaries/20family_dynamic_jinja_fill/xml/00-base.xml new file mode 100644 index 000000000..6c3d8bd6f --- /dev/null +++ b/tests/dictionaries/20family_dynamic_jinja_fill/xml/00-base.xml @@ -0,0 +1,24 @@ + + + + + + val1 + val2 + + + + + val + + + + + + + + + newvar + + + diff --git a/tests/dictionaries/20family_dynamic_jinja_fill/yml/00-base.yml b/tests/dictionaries/20family_dynamic_jinja_fill/yml/00-base.yml new file mode 100644 index 000000000..b31960818 --- /dev/null +++ b/tests/dictionaries/20family_dynamic_jinja_fill/yml/00-base.yml @@ -0,0 +1,34 @@ +version: '0.10' +variables: +- family: + - name: general + variables: + - variable: + - name: varname + type: string + description: No change + multi: true + value: + - text: val1 + - text: val2 + - name: dyn + dynamic: varname + variables: + - variable: + - name: vardyn + type: string + description: No change + value: + - text: val + - name: new + variables: + - variable: + - name: newvar + type: string + description: No change +constraints: +- fill: + - name: '{{ vardynval1 }}' + type: jinja + target: + - text: newvar diff --git a/tests/dictionaries/20family_dynamic_leadership/tiramisu/base.py b/tests/dictionaries/20family_dynamic_leadership/tiramisu/base.py index dd6c980b3..432de005e 100644 --- a/tests/dictionaries/20family_dynamic_leadership/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_leadership/tiramisu/base.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) -option_6 = StrOption(name="leader", doc="leader", multi=True) +option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"})) option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_5 = Leadership(name="leadership", doc="leadership", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4, optiondescription_5], properties=frozenset({"normal"})) -optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9]) diff --git a/tests/dictionaries/20family_dynamic_leadership/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_leadership/tiramisu/multi.py index 7dfd1b6c2..e4a0819ea 100644 --- a/tests/dictionaries/20family_dynamic_leadership/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_leadership/tiramisu/multi.py @@ -16,27 +16,32 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) -option_6 = StrOption(name="leader", doc="leader", multi=True) +option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"})) option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_5 = Leadership(name="leadership", doc="leadership", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4, optiondescription_5], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="1", doc="1", children=[optiondescription_18]) option_10 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) optiondescription_9 = OptionDescription(name="general", doc="general", children=[option_10], properties=frozenset({"normal"})) option_12 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) -option_14 = StrOption(name="leader", doc="leader", multi=True) +option_14 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) option_15 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"})) option_16 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) optiondescription_13 = Leadership(name="leadership", doc="leadership", children=[option_14, option_15, option_16], properties=frozenset({"normal"})) optiondescription_11 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_10, notraisepropertyerror=True)))), children=[option_12, optiondescription_13], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_9, optiondescription_11]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_9, optiondescription_11], properties=frozenset({"normal"})) optiondescription_19 = OptionDescription(name="2", doc="2", children=[optiondescription_20]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_17, optiondescription_19]) diff --git a/tests/dictionaries/20family_dynamic_number/tiramisu/base.py b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py index d20959952..21105b17a 100644 --- a/tests/dictionaries/20family_dynamic_number/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") from rougail.tiramisu import ConvertDynOptionDescription option_2 = IntOption(name="varname", doc="No change", multi=True, default=[1, 2], default_multi=1, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) @@ -25,5 +30,5 @@ option_4 = StrOption(name="vardyn", doc="No change", default="val", properties=f optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) option_6 = StrOption(name="newvar", doc="No change", default=Calculation(func.calc_val, Params((ParamDynOption(option_4, '1', optiondescription_3)))), properties=frozenset({"normal"})) 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]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3, optiondescription_5], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/20family_dynamic_number/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_number/tiramisu/multi.py index 9d30eed03..8a4d3ab19 100644 --- a/tests/dictionaries/20family_dynamic_number/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_number/tiramisu/multi.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") from rougail.tiramisu import ConvertDynOptionDescription option_2 = IntOption(name="varname", doc="No change", multi=True, default=[1, 2], default_multi=1, properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) @@ -25,7 +30,7 @@ option_4 = StrOption(name="vardyn", doc="No change", default="val", properties=f optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) option_6 = StrOption(name="newvar", doc="No change", default=Calculation(func.calc_val, Params((ParamDynOption(option_4, '1', optiondescription_3)))), properties=frozenset({"normal"})) 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3, optiondescription_5], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) option_8 = IntOption(name="varname", doc="No change", multi=True, default=[1, 2], default_multi=1, properties=frozenset({"mandatory", "normal"})) optiondescription_7 = OptionDescription(name="general", doc="general", children=[option_8], properties=frozenset({"normal"})) @@ -33,6 +38,6 @@ option_10 = StrOption(name="vardyn", doc="No change", default="val", properties= optiondescription_9 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_8, notraisepropertyerror=True)))), children=[option_10], properties=frozenset({"normal"})) option_12 = StrOption(name="newvar", doc="No change", default=Calculation(func.calc_val, Params((ParamDynOption(option_10, '1', optiondescription_9)))), properties=frozenset({"normal"})) 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_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7, optiondescription_9, optiondescription_11], properties=frozenset({"normal"})) 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/20family_empty/tiramisu/base.py b/tests/dictionaries/20family_empty/tiramisu/base.py index 57ca7f7aa..92db6fecb 100644 --- a/tests/dictionaries/20family_empty/tiramisu/base.py +++ b/tests/dictionaries/20family_empty/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"basic", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"basic"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/20family_empty/tiramisu/multi.py b/tests/dictionaries/20family_empty/tiramisu/multi.py index 9910aef16..3bc95c70e 100644 --- a/tests/dictionaries/20family_empty/tiramisu/multi.py +++ b/tests/dictionaries/20family_empty/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"basic", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"basic"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"basic", "mandatory"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5], properties=frozenset({"basic"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"basic"})) 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/20family_hidden/tiramisu/base.py b/tests/dictionaries/20family_hidden/tiramisu/base.py index 2894ffeee..f7544e370 100644 --- a/tests/dictionaries/20family_hidden/tiramisu/base.py +++ b/tests/dictionaries/20family_hidden/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"hidden", "normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/20family_hidden/tiramisu/multi.py b/tests/dictionaries/20family_hidden/tiramisu/multi.py index c000321b2..c4d50a1d5 100644 --- a/tests/dictionaries/20family_hidden/tiramisu/multi.py +++ b/tests/dictionaries/20family_hidden/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"hidden", "normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"hidden", "normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/20family_mode/tiramisu/base.py b/tests/dictionaries/20family_mode/tiramisu/base.py index 8fe049628..8383d644c 100644 --- a/tests/dictionaries/20family_mode/tiramisu/base.py +++ b/tests/dictionaries/20family_mode/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"basic", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"basic"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/20family_mode/tiramisu/multi.py b/tests/dictionaries/20family_mode/tiramisu/multi.py index 39eb3a17d..7b2130778 100644 --- a/tests/dictionaries/20family_mode/tiramisu/multi.py +++ b/tests/dictionaries/20family_mode/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"basic", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"basic"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"basic", "mandatory"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"basic"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"basic"})) 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/20family_modeleadership/tiramisu/base.py b/tests/dictionaries/20family_modeleadership/tiramisu/base.py index 99b42d10e..62f0bb0d8 100644 --- a/tests/dictionaries/20family_modeleadership/tiramisu/base.py +++ b/tests/dictionaries/20family_modeleadership/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"basic"})) option_5 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"basic"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"basic"})) -optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/20family_modeleadership/tiramisu/multi.py b/tests/dictionaries/20family_modeleadership/tiramisu/multi.py index ffac80f3c..3af970632 100644 --- a/tests/dictionaries/20family_modeleadership/tiramisu/multi.py +++ b/tests/dictionaries/20family_modeleadership/tiramisu/multi.py @@ -16,22 +16,27 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="leader", doc="leader", multi=True) +option_4 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"basic"})) option_5 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"})) option_6 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"basic"})) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5, option_6], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"basic"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) option_8 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_10 = StrOption(name="leader", doc="leader", multi=True) +option_10 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"basic"})) option_11 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"})) option_12 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"basic"})) optiondescription_9 = Leadership(name="leader", doc="leader", children=[option_10, option_11, option_12], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="general", doc="general", children=[option_8, optiondescription_9], properties=frozenset({"basic"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7], properties=frozenset({"basic"})) 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/20notemplating/tiramisu/base.py b/tests/dictionaries/20notemplating/tiramisu/base.py index 55a57e940..7e4b21d7b 100644 --- a/tests/dictionaries/20notemplating/tiramisu/base.py +++ b/tests/dictionaries/20notemplating/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/file") option_8 = StrOption(name="source", doc="source", default="file") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/20notemplating/tiramisu/multi.py b/tests/dictionaries/20notemplating/tiramisu/multi.py index 678d29834..65d728d48 100644 --- a/tests/dictionaries/20notemplating/tiramisu/multi.py +++ b/tests/dictionaries/20notemplating/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -35,7 +40,7 @@ optiondescription_21 = OptionDescription(name="services", doc="services", childr optiondescription_19 = OptionDescription(name="1", doc="1", children=[optiondescription_20, optiondescription_21]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_16 = FilenameOption(name="name", doc="name", default="/etc/file") option_17 = StrOption(name="source", doc="source", default="file") option_15 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/20override/tiramisu/base.py b/tests/dictionaries/20override/tiramisu/base.py index 8934871c1..2c6238631 100644 --- a/tests/dictionaries/20override/tiramisu/base.py +++ b/tests/dictionaries/20override/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_13 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_13 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_6 = BoolOption(name="activate", doc="activate", default=True) optiondescription_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6]) optiondescription_5.impl_set_information('name', "test.service") diff --git a/tests/dictionaries/20override/tiramisu/multi.py b/tests/dictionaries/20override/tiramisu/multi.py index e9126e495..64ad9ca92 100644 --- a/tests/dictionaries/20override/tiramisu/multi.py +++ b/tests/dictionaries/20override/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_8 = BoolOption(name="activate", doc="activate", default=True) optiondescription_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8]) optiondescription_7.impl_set_information('name', "test.service") @@ -44,7 +49,7 @@ optiondescription_27 = OptionDescription(name="services", doc="services", childr optiondescription_25 = OptionDescription(name="1", doc="1", children=[optiondescription_26, optiondescription_27]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_31 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_31 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_18 = BoolOption(name="activate", doc="activate", default=True) optiondescription_17 = OptionDescription(name="test_service", doc="test.service", children=[option_18]) optiondescription_17.impl_set_information('name', "test.service") diff --git a/tests/dictionaries/20override_no_templating/tiramisu/base.py b/tests/dictionaries/20override_no_templating/tiramisu/base.py index fe1777d9e..2bdb6a271 100644 --- a/tests/dictionaries/20override_no_templating/tiramisu/base.py +++ b/tests/dictionaries/20override_no_templating/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_6 = BoolOption(name="activate", doc="activate", default=True) optiondescription_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6]) optiondescription_5.impl_set_information('engine', "none") diff --git a/tests/dictionaries/20override_no_templating/tiramisu/multi.py b/tests/dictionaries/20override_no_templating/tiramisu/multi.py index 89c1925b1..ab3241e90 100644 --- a/tests/dictionaries/20override_no_templating/tiramisu/multi.py +++ b/tests/dictionaries/20override_no_templating/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_8 = BoolOption(name="activate", doc="activate", default=True) optiondescription_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8]) optiondescription_7.impl_set_information('engine', "none") @@ -35,7 +40,7 @@ optiondescription_17 = OptionDescription(name="services", doc="services", childr optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16, optiondescription_17]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_13 = BoolOption(name="activate", doc="activate", default=True) optiondescription_12 = OptionDescription(name="test_service", doc="test.service", children=[option_13]) optiondescription_12.impl_set_information('engine', "none") diff --git a/tests/dictionaries/20override_source/tiramisu/base.py b/tests/dictionaries/20override_source/tiramisu/base.py index 826a58020..24647c9e9 100644 --- a/tests/dictionaries/20override_source/tiramisu/base.py +++ b/tests/dictionaries/20override_source/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_6 = BoolOption(name="activate", doc="activate", default=True) optiondescription_5 = OptionDescription(name="test2_service", doc="test2.service", children=[option_6]) optiondescription_5.impl_set_information('name', "test.service") diff --git a/tests/dictionaries/20override_source/tiramisu/multi.py b/tests/dictionaries/20override_source/tiramisu/multi.py index fd3c4776d..f9f6a9259 100644 --- a/tests/dictionaries/20override_source/tiramisu/multi.py +++ b/tests/dictionaries/20override_source/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_8 = BoolOption(name="activate", doc="activate", default=True) optiondescription_7 = OptionDescription(name="test2_service", doc="test2.service", children=[option_8]) optiondescription_7.impl_set_information('name', "test.service") @@ -34,7 +39,7 @@ optiondescription_17 = OptionDescription(name="services", doc="services", childr optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16, optiondescription_17]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_13 = BoolOption(name="activate", doc="activate", default=True) optiondescription_12 = OptionDescription(name="test2_service", doc="test2.service", children=[option_13]) optiondescription_12.impl_set_information('name', "test.service") diff --git a/tests/dictionaries/21family_empty/tiramisu/base.py b/tests/dictionaries/21family_empty/tiramisu/base.py index 136e03d9c..24934c607 100644 --- a/tests/dictionaries/21family_empty/tiramisu/base.py +++ b/tests/dictionaries/21family_empty/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/21family_empty/tiramisu/multi.py b/tests/dictionaries/21family_empty/tiramisu/multi.py index fd0d230c0..d96ffc5a9 100644 --- a/tests/dictionaries/21family_empty/tiramisu/multi.py +++ b/tests/dictionaries/21family_empty/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/21family_empty_sub/tiramisu/base.py b/tests/dictionaries/21family_empty_sub/tiramisu/base.py index ed5af9b0a..0e5b0ea42 100644 --- a/tests/dictionaries/21family_empty_sub/tiramisu/base.py +++ b/tests/dictionaries/21family_empty_sub/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/21family_empty_sub/tiramisu/multi.py b/tests/dictionaries/21family_empty_sub/tiramisu/multi.py index c382b192b..e850ec281 100644 --- a/tests/dictionaries/21family_empty_sub/tiramisu/multi.py +++ b/tests/dictionaries/21family_empty_sub/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/22provider_dynamic/tiramisu/base.py b/tests/dictionaries/22provider_dynamic/tiramisu/base.py index 8445a25a9..9835e1deb 100644 --- a/tests/dictionaries/22provider_dynamic/tiramisu/base.py +++ b/tests/dictionaries/22provider_dynamic/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) option_0.impl_set_information('provider:dyn', "rougail.dyn{suffix}.vardyn{suffix}") diff --git a/tests/dictionaries/22provider_dynamic/tiramisu/multi.py b/tests/dictionaries/22provider_dynamic/tiramisu/multi.py index 1841bf654..136352532 100644 --- a/tests/dictionaries/22provider_dynamic/tiramisu/multi.py +++ b/tests/dictionaries/22provider_dynamic/tiramisu/multi.py @@ -16,21 +16,26 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_4 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) optiondescription_9.impl_set_information('provider:dyn', "rougail.dyn{suffix}.vardyn{suffix}") option_6 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = OptionDescription(name="general", doc="general", children=[option_6], properties=frozenset({"normal"})) option_8 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) optiondescription_7 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_6, notraisepropertyerror=True)))), children=[option_8], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) optiondescription_11.impl_set_information('provider:dyn', "rougail.dyn{suffix}.vardyn{suffix}") option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9, optiondescription_11]) diff --git a/tests/dictionaries/22provider_dynamic_2/tiramisu/base.py b/tests/dictionaries/22provider_dynamic_2/tiramisu/base.py index 2c1b854e2..20f59d818 100644 --- a/tests/dictionaries/22provider_dynamic_2/tiramisu/base.py +++ b/tests/dictionaries/22provider_dynamic_2/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") from rougail.tiramisu import ConvertDynOptionDescription option_1 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_1, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) optiondescription_2 = OptionDescription(name="general", doc="general", children=[optiondescription_3], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) option_0.impl_set_information('provider:dyn', "rougail.general.dyn{suffix}.vardyn{suffix}") diff --git a/tests/dictionaries/22provider_dynamic_2/tiramisu/multi.py b/tests/dictionaries/22provider_dynamic_2/tiramisu/multi.py index 2d21d6fd3..46662d733 100644 --- a/tests/dictionaries/22provider_dynamic_2/tiramisu/multi.py +++ b/tests/dictionaries/22provider_dynamic_2/tiramisu/multi.py @@ -16,21 +16,26 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") from rougail.tiramisu import ConvertDynOptionDescription option_1 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) optiondescription_3 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_1, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) optiondescription_2 = OptionDescription(name="general", doc="general", children=[optiondescription_3], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"normal"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) optiondescription_9.impl_set_information('provider:dyn', "rougail.general.dyn{suffix}.vardyn{suffix}") option_5 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) option_8 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) optiondescription_7 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_5, notraisepropertyerror=True)))), children=[option_8], properties=frozenset({"normal"})) optiondescription_6 = OptionDescription(name="general", doc="general", children=[optiondescription_7], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_5, optiondescription_6]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_5, optiondescription_6], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="2", doc="2", children=[optiondescription_12]) optiondescription_11.impl_set_information('provider:dyn', "rougail.general.dyn{suffix}.vardyn{suffix}") option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9, optiondescription_11]) diff --git a/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py index a82f34bcb..cb0d0f113 100644 --- a/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", properties=frozenset({"basic", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"basic"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/30mandatory_withoutvalue/tiramisu/multi.py b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/multi.py index 866296b04..129b3ee57 100644 --- a/tests/dictionaries/30mandatory_withoutvalue/tiramisu/multi.py +++ b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", properties=frozenset({"basic", "mandatory"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"basic"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", properties=frozenset({"basic", "mandatory"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"basic"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"basic"})) 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/30mandatory_withoutvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py index eadb8f8b9..f65b8685b 100644 --- a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("value")))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/multi.py b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/multi.py index c8cc70ba9..3e3805be4 100644 --- a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/multi.py +++ b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("value")))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("value")))), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/30mandatory_withvalue/tiramisu/base.py b/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py index 9ca3391d1..bb1797092 100644 --- a/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="value", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/30mandatory_withvalue/tiramisu/multi.py b/tests/dictionaries/30mandatory_withvalue/tiramisu/multi.py index f434aaf24..8bcbe5e84 100644 --- a/tests/dictionaries/30mandatory_withvalue/tiramisu/multi.py +++ b/tests/dictionaries/30mandatory_withvalue/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="value", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="value", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/30mandatory_withvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py index e9eae8fc5..b7952c849 100644 --- a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("value")))), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/multi.py b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/multi.py index 69fc91797..6a0e5331d 100644 --- a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/multi.py +++ b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("value")))), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("value")))), properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/40condition_base/tiramisu/base.py b/tests/dictionaries/40condition_base/tiramisu/base.py index 952626459..b96b49b64 100644 --- a/tests/dictionaries/40condition_base/tiramisu/base.py +++ b/tests/dictionaries/40condition_base/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 5169c2d09..e8a67e8bf 100644 --- a/tests/dictionaries/40condition_base/tiramisu/multi.py +++ b/tests/dictionaries/40condition_base/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/40condition_base_add/tiramisu/base.py b/tests/dictionaries/40condition_base_add/tiramisu/base.py index 952626459..b96b49b64 100644 --- a/tests/dictionaries/40condition_base_add/tiramisu/base.py +++ b/tests/dictionaries/40condition_base_add/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 5169c2d09..e8a67e8bf 100644 --- a/tests/dictionaries/40condition_base_add/tiramisu/multi.py +++ b/tests/dictionaries/40condition_base_add/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/40condition_fallback/tiramisu/base.py b/tests/dictionaries/40condition_fallback/tiramisu/base.py index e61823148..85184b3a4 100644 --- a/tests/dictionaries/40condition_fallback/tiramisu/base.py +++ b/tests/dictionaries/40condition_fallback/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = OptionDescription(name="disabled_family", doc="disabled_family", children=[option_6], properties=frozenset({"disabled", "normal"})) -optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_5]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_5], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/40condition_fallback/tiramisu/multi.py b/tests/dictionaries/40condition_fallback/tiramisu/multi.py index 30b45efc6..b362ab39f 100644 --- a/tests/dictionaries/40condition_fallback/tiramisu/multi.py +++ b/tests/dictionaries/40condition_fallback/tiramisu/multi.py @@ -16,15 +16,20 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4], properties=frozenset({"normal"})) option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = OptionDescription(name="disabled_family", doc="disabled_family", children=[option_6], properties=frozenset({"disabled", "normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_5]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_5], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) option_8 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_9 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"})) @@ -32,6 +37,6 @@ option_10 = StrOption(name="mode_conteneur_actif2", doc="No change", default="no optiondescription_7 = OptionDescription(name="general", doc="general", children=[option_8, option_9, option_10], properties=frozenset({"normal"})) option_12 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_11 = OptionDescription(name="disabled_family", doc="disabled_family", children=[option_12], properties=frozenset({"disabled", "normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7, optiondescription_11]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7, optiondescription_11], properties=frozenset({"normal"})) 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/40condition_optional/tiramisu/base.py b/tests/dictionaries/40condition_optional/tiramisu/base.py index 062c4eab9..1a6ef72e1 100644 --- a/tests/dictionaries/40condition_optional/tiramisu/base.py +++ b/tests/dictionaries/40condition_optional/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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 e632fdefb..90b10c198 100644 --- a/tests/dictionaries/40condition_optional/tiramisu/multi.py +++ b/tests/dictionaries/40condition_optional/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/40condition_optional_empty/tiramisu/base.py b/tests/dictionaries/40condition_optional_empty/tiramisu/base.py index 68e4c0b2e..029f14311 100644 --- a/tests/dictionaries/40condition_optional_empty/tiramisu/base.py +++ b/tests/dictionaries/40condition_optional_empty/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) 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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/40condition_optional_empty/tiramisu/multi.py b/tests/dictionaries/40condition_optional_empty/tiramisu/multi.py index f3290a24c..77b1954e0 100644 --- a/tests/dictionaries/40condition_optional_empty/tiramisu/multi.py +++ b/tests/dictionaries/40condition_optional_empty/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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"})) 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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"})) 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/40condition_optional_family/tiramisu/base.py b/tests/dictionaries/40condition_optional_family/tiramisu/base.py index 92be6fd46..d0933ad29 100644 --- a/tests/dictionaries/40condition_optional_family/tiramisu/base.py +++ b/tests/dictionaries/40condition_optional_family/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"normal"})) 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 f0e659a50..8ba13887a 100644 --- a/tests/dictionaries/40condition_optional_family/tiramisu/multi.py +++ b/tests/dictionaries/40condition_optional_family/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"normal"})) 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, notraisepropertyerror=True), 'expected': ParamValue(True)}), func.calc_value_property_help)})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, optiondescription_5]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, optiondescription_5], properties=frozenset({"normal"})) 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/40empty_param/tiramisu/base.py b/tests/dictionaries/40empty_param/tiramisu/base.py index 573a12507..2e3a9a08f 100644 --- a/tests/dictionaries/40empty_param/tiramisu/base.py +++ b/tests/dictionaries/40empty_param/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = PortOption(name="toto1", doc="Port d'écoute du proxy", default=Calculation(func.calc_multi_condition, Params((ParamValue(None)))), allow_private=True, allow_protocol=True, properties=frozenset({"expert"})) option_3 = PortOption(name="toto2", doc="Port d'écoute du proxy NTLM", default="3127", allow_private=True, allow_protocol=True, properties=frozenset({"expert", "mandatory"})) optiondescription_1 = OptionDescription(name="proxy_authentifie", doc="proxy authentifié", children=[option_2, option_3], properties=frozenset({"expert"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/40empty_param/tiramisu/multi.py b/tests/dictionaries/40empty_param/tiramisu/multi.py index dda4f6e3f..062703b22 100644 --- a/tests/dictionaries/40empty_param/tiramisu/multi.py +++ b/tests/dictionaries/40empty_param/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = PortOption(name="toto1", doc="Port d'écoute du proxy", default=Calculation(func.calc_multi_condition, Params((ParamValue(None)))), allow_private=True, allow_protocol=True, properties=frozenset({"expert"})) option_3 = PortOption(name="toto2", doc="Port d'écoute du proxy NTLM", default="3127", allow_private=True, allow_protocol=True, properties=frozenset({"expert", "mandatory"})) optiondescription_1 = OptionDescription(name="proxy_authentifie", doc="proxy authentifié", children=[option_2, option_3], properties=frozenset({"expert"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"expert"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = PortOption(name="toto1", doc="Port d'écoute du proxy", default=Calculation(func.calc_multi_condition, Params((ParamValue(None)))), allow_private=True, allow_protocol=True, properties=frozenset({"expert"})) option_6 = PortOption(name="toto2", doc="Port d'écoute du proxy NTLM", default="3127", allow_private=True, allow_protocol=True, properties=frozenset({"expert", "mandatory"})) optiondescription_4 = OptionDescription(name="proxy_authentifie", doc="proxy authentifié", children=[option_5, option_6], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"expert"})) 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/40empty_param2/tiramisu/base.py b/tests/dictionaries/40empty_param2/tiramisu/base.py index 30602582a..b12675abd 100644 --- a/tests/dictionaries/40empty_param2/tiramisu/base.py +++ b/tests/dictionaries/40empty_param2/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = PortOption(name="toto1", doc="Port d'écoute du proxy", default=Calculation(func.calc_multi_condition, Params((), kwargs={'value': ParamValue(None)})), allow_private=True, allow_protocol=True, properties=frozenset({"expert"})) option_3 = PortOption(name="toto2", doc="Port d'écoute du proxy NTLM", default="3127", allow_private=True, allow_protocol=True, properties=frozenset({"expert", "mandatory"})) optiondescription_1 = OptionDescription(name="proxy_authentifie", doc="proxy authentifié", children=[option_2, option_3], properties=frozenset({"expert"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/40empty_param2/tiramisu/multi.py b/tests/dictionaries/40empty_param2/tiramisu/multi.py index 409fc53b6..32d2464eb 100644 --- a/tests/dictionaries/40empty_param2/tiramisu/multi.py +++ b/tests/dictionaries/40empty_param2/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = PortOption(name="toto1", doc="Port d'écoute du proxy", default=Calculation(func.calc_multi_condition, Params((), kwargs={'value': ParamValue(None)})), allow_private=True, allow_protocol=True, properties=frozenset({"expert"})) option_3 = PortOption(name="toto2", doc="Port d'écoute du proxy NTLM", default="3127", allow_private=True, allow_protocol=True, properties=frozenset({"expert", "mandatory"})) optiondescription_1 = OptionDescription(name="proxy_authentifie", doc="proxy authentifié", children=[option_2, option_3], properties=frozenset({"expert"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"expert"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = PortOption(name="toto1", doc="Port d'écoute du proxy", default=Calculation(func.calc_multi_condition, Params((), kwargs={'value': ParamValue(None)})), allow_private=True, allow_protocol=True, properties=frozenset({"expert"})) option_6 = PortOption(name="toto2", doc="Port d'écoute du proxy NTLM", default="3127", allow_private=True, allow_protocol=True, properties=frozenset({"expert", "mandatory"})) optiondescription_4 = OptionDescription(name="proxy_authentifie", doc="proxy authentifié", children=[option_5, option_6], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"expert"})) 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/40hidden_if_in_leadership_fallback/tiramisu/base.py b/tests/dictionaries/40hidden_if_in_leadership_fallback/tiramisu/base.py index 25b802f76..dab2ee5ac 100644 --- a/tests/dictionaries/40hidden_if_in_leadership_fallback/tiramisu/base.py +++ b/tests/dictionaries/40hidden_if_in_leadership_fallback/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", multi=True, default=['non'], properties=frozenset({"force_default_on_freeze", "frozen", "mandatory"})) +option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", multi=True, default=['non'], properties=frozenset({"force_default_on_freeze", "frozen", "mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", multi=True, default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "mandatory", "normal"})) optiondescription_3 = Leadership(name="mode_conteneur_actif1", doc="No change", children=[option_4, option_5], properties=frozenset({"hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/40hidden_if_in_leadership_fallback/tiramisu/multi.py b/tests/dictionaries/40hidden_if_in_leadership_fallback/tiramisu/multi.py index 330e464a9..759590729 100644 --- a/tests/dictionaries/40hidden_if_in_leadership_fallback/tiramisu/multi.py +++ b/tests/dictionaries/40hidden_if_in_leadership_fallback/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", multi=True, default=['non'], properties=frozenset({"force_default_on_freeze", "frozen", "mandatory"})) +option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", multi=True, default=['non'], properties=frozenset({"force_default_on_freeze", "frozen", "mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", multi=True, default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "mandatory", "normal"})) optiondescription_3 = Leadership(name="mode_conteneur_actif1", doc="No change", children=[option_4, option_5], properties=frozenset({"hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, optiondescription_3], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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_9 = StrOption(name="mode_conteneur_actif1", doc="No change", multi=True, default=['non'], properties=frozenset({"force_default_on_freeze", "frozen", "mandatory"})) +option_9 = StrOption(name="mode_conteneur_actif1", doc="No change", multi=True, default=['non'], properties=frozenset({"force_default_on_freeze", "frozen", "mandatory", "normal"})) option_10 = StrOption(name="mode_conteneur_actif2", doc="No change", multi=True, default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "mandatory", "normal"})) optiondescription_8 = Leadership(name="mode_conteneur_actif1", doc="No change", children=[option_9, option_10], properties=frozenset({"hidden", "normal"})) optiondescription_6 = OptionDescription(name="general", doc="general", children=[option_7, optiondescription_8], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/40ifin_leadership/tiramisu/base.py b/tests/dictionaries/40ifin_leadership/tiramisu/base.py index b7cf6e103..6f3ad4054 100644 --- a/tests/dictionaries/40ifin_leadership/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadership/tiramisu/base.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) 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"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8]) diff --git a/tests/dictionaries/40ifin_leadership/tiramisu/multi.py b/tests/dictionaries/40ifin_leadership/tiramisu/multi.py index cd8164094..2bf952725 100644 --- a/tests/dictionaries/40ifin_leadership/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_leadership/tiramisu/multi.py @@ -16,24 +16,29 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_5 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) 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"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16]) 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_12 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"normal"})) 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"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="2", doc="2", children=[optiondescription_18]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_17]) diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py index 0ef0a67d0..0985a413a 100644 --- a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_5 = StrOption(name="leader", doc="leader", multi=True, default=['a'], properties=frozenset({"mandatory", "normal"})) 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"})) -optiondescription_15 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_15 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_12 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_13 = StrOption(name="source", doc="source", default="mailname") option_11 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/multi.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/multi.py index 96dd8ca71..111bdc944 100644 --- a/tests/dictionaries/40ifin_leadershipauto/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_leadershipauto/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_5 = StrOption(name="leader", doc="leader", multi=True, default=['a'], properties=frozenset({"mandatory", "normal"})) 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"})) -optiondescription_30 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_30 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_19 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_20 = StrOption(name="source", doc="source", default="mailname") option_18 = BoolOption(name="activate", doc="activate", default=True) @@ -39,12 +44,12 @@ optiondescription_31 = OptionDescription(name="services", doc="services", childr optiondescription_29 = OptionDescription(name="1", doc="1", children=[optiondescription_30, optiondescription_31]) 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_12 = StrOption(name="leader", doc="leader", multi=True, default=['a'], properties=frozenset({"mandatory", "normal"})) 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"})) -optiondescription_34 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8]) +optiondescription_34 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"normal"})) option_26 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_27 = StrOption(name="source", doc="source", default="mailname") option_25 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py index f4f890b59..604042b4f 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_5 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b'], properties=frozenset({"mandatory", "normal"})) 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"})) -optiondescription_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_12 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_13 = StrOption(name="source", doc="source", default="mailname") option_11 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py index 0b1cb4e40..e0011275a 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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_5 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b'], properties=frozenset({"mandatory", "normal"})) 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"})) -optiondescription_38 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_38 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_19 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_20 = StrOption(name="source", doc="source", default="mailname") option_18 = BoolOption(name="activate", doc="activate", default=True) @@ -44,12 +49,12 @@ optiondescription_39 = OptionDescription(name="services", doc="services", childr optiondescription_37 = OptionDescription(name="1", doc="1", children=[optiondescription_38, optiondescription_39]) 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_12 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b'], properties=frozenset({"mandatory", "normal"})) 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"})) -optiondescription_42 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8]) +optiondescription_42 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"normal"})) option_30 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_31 = StrOption(name="source", doc="source", default="mailname") option_29 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/40ifin_multi/tiramisu/base.py b/tests/dictionaries/40ifin_multi/tiramisu/base.py index 95f225e19..cceb106f0 100644 --- a/tests/dictionaries/40ifin_multi/tiramisu/base.py +++ b/tests/dictionaries/40ifin_multi/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) 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 9f584bd18..04a628bc2 100644 --- a/tests/dictionaries/40ifin_multi/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_multi/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) 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, 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6, optiondescription_8], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/40ifin_multi2/tiramisu/base.py b/tests/dictionaries/40ifin_multi2/tiramisu/base.py index 97959256c..b70e2a19b 100644 --- a/tests/dictionaries/40ifin_multi2/tiramisu/base.py +++ b/tests/dictionaries/40ifin_multi2/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) 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 019a6da76..7d0754d5b 100644 --- a/tests/dictionaries/40ifin_multi2/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_multi2/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) 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, 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6, optiondescription_8], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/40ifin_validenum/tiramisu/base.py b/tests/dictionaries/40ifin_validenum/tiramisu/base.py index dc364871c..a41becda3 100644 --- a/tests/dictionaries/40ifin_validenum/tiramisu/base.py +++ b/tests/dictionaries/40ifin_validenum/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"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({"disabled", "mandatory", "normal"})) option_5 = ChoiceOption(name="mode_conteneur_actif3", doc="No change", values=('a', 'b', 'c'), default="a", properties=frozenset({"mandatory", "normal"})) 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]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/40ifin_validenum/tiramisu/multi.py b/tests/dictionaries/40ifin_validenum/tiramisu/multi.py index ffda8ab7c..4f7c3450d 100644 --- a/tests/dictionaries/40ifin_validenum/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_validenum/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"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({"disabled", "mandatory", "normal"})) option_5 = ChoiceOption(name="mode_conteneur_actif3", doc="No change", values=('a', 'b', 'c'), default="a", properties=frozenset({"mandatory", "normal"})) 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) 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"})) 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({"disabled", "mandatory", "normal"})) option_10 = ChoiceOption(name="mode_conteneur_actif3", doc="No change", values=('a', 'b', 'c'), default="a", properties=frozenset({"mandatory", "normal"})) 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6, optiondescription_8], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/40space_param/tiramisu/base.py b/tests/dictionaries/40space_param/tiramisu/base.py index c967ec86d..d7fa7e67a 100644 --- a/tests/dictionaries/40space_param/tiramisu/base.py +++ b/tests/dictionaries/40space_param/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = PortOption(name="toto1", doc="Port d'écoute du proxy", default=Calculation(func.calc_multi_condition, Params((ParamValue(" ")))), allow_private=True, allow_protocol=True, properties=frozenset({"expert"})) option_3 = PortOption(name="toto2", doc="Port d'écoute du proxy NTLM", default="3127", allow_private=True, allow_protocol=True, properties=frozenset({"expert", "mandatory"})) optiondescription_1 = OptionDescription(name="proxy_authentifie", doc="proxy authentifié", children=[option_2, option_3], properties=frozenset({"expert"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/40space_param/tiramisu/multi.py b/tests/dictionaries/40space_param/tiramisu/multi.py index bbc6b94f9..748c236bd 100644 --- a/tests/dictionaries/40space_param/tiramisu/multi.py +++ b/tests/dictionaries/40space_param/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = PortOption(name="toto1", doc="Port d'écoute du proxy", default=Calculation(func.calc_multi_condition, Params((ParamValue(" ")))), allow_private=True, allow_protocol=True, properties=frozenset({"expert"})) option_3 = PortOption(name="toto2", doc="Port d'écoute du proxy NTLM", default="3127", allow_private=True, allow_protocol=True, properties=frozenset({"expert", "mandatory"})) optiondescription_1 = OptionDescription(name="proxy_authentifie", doc="proxy authentifié", children=[option_2, option_3], properties=frozenset({"expert"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"expert"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = PortOption(name="toto1", doc="Port d'écoute du proxy", default=Calculation(func.calc_multi_condition, Params((ParamValue(" ")))), allow_private=True, allow_protocol=True, properties=frozenset({"expert"})) option_6 = PortOption(name="toto2", doc="Port d'écoute du proxy NTLM", default="3127", allow_private=True, allow_protocol=True, properties=frozenset({"expert", "mandatory"})) optiondescription_4 = OptionDescription(name="proxy_authentifie", doc="proxy authentifié", children=[option_5, option_6], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"expert"})) 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/45extra_without_family/tiramisu/base.py b/tests/dictionaries/45extra_without_family/tiramisu/base.py index 73284a136..5ba5c5ca7 100644 --- a/tests/dictionaries/45extra_without_family/tiramisu/base.py +++ b/tests/dictionaries/45extra_without_family/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="my_var", doc="my_var", default="rougail", properties=frozenset({"mandatory", "normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_2 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_multi_condition, Params((ParamValue("non")))), properties=frozenset({"normal"})) -optiondescription_11 = OptionDescription(name="extra", doc="extra", children=[option_2]) +optiondescription_11 = OptionDescription(name="extra", doc="extra", children=[option_2], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/file") option_8 = StrOption(name="source", doc="source", default="file") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/45extra_without_family/tiramisu/multi.py b/tests/dictionaries/45extra_without_family/tiramisu/multi.py index d5a85bc1f..a88ed3c52 100644 --- a/tests/dictionaries/45extra_without_family/tiramisu/multi.py +++ b/tests/dictionaries/45extra_without_family/tiramisu/multi.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="my_var", doc="my_var", default="rougail", properties=frozenset({"mandatory", "normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_2 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_multi_condition, Params((ParamValue("non")))), properties=frozenset({"normal"})) -optiondescription_21 = OptionDescription(name="extra", doc="extra", children=[option_2]) +optiondescription_21 = OptionDescription(name="extra", doc="extra", children=[option_2], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -34,9 +39,9 @@ optiondescription_23.impl_set_information('type', "service") optiondescription_22 = OptionDescription(name="services", doc="services", children=[optiondescription_23], properties=frozenset({"hidden"})) optiondescription_19 = OptionDescription(name="1", doc="1", children=[optiondescription_20, optiondescription_21, optiondescription_22]) option_3 = StrOption(name="my_var", doc="my_var", default="rougail", properties=frozenset({"mandatory", "normal"})) -optiondescription_25 = OptionDescription(name="rougail", doc="Rougail", children=[option_3]) +optiondescription_25 = OptionDescription(name="rougail", doc="Rougail", children=[option_3], properties=frozenset({"normal"})) option_4 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_multi_condition, Params((ParamValue("non")))), properties=frozenset({"normal"})) -optiondescription_26 = OptionDescription(name="extra", doc="extra", children=[option_4]) +optiondescription_26 = OptionDescription(name="extra", doc="extra", children=[option_4], properties=frozenset({"normal"})) option_16 = FilenameOption(name="name", doc="name", default="/etc/file") option_17 = StrOption(name="source", doc="source", default="file") option_15 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/45multi_family/tiramisu/base.py b/tests/dictionaries/45multi_family/tiramisu/base.py index f9e3fb38f..7412c5fbe 100644 --- a/tests/dictionaries/45multi_family/tiramisu/base.py +++ b/tests/dictionaries/45multi_family/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="variable", doc="variable", properties=frozenset({"normal"})) optiondescription_2 = OptionDescription(name="subfamily", doc="subfamily", children=[option_3], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="base", doc="base", children=[optiondescription_2], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/45multi_family/tiramisu/multi.py b/tests/dictionaries/45multi_family/tiramisu/multi.py index 1f3b68210..fdbd7aebb 100644 --- a/tests/dictionaries/45multi_family/tiramisu/multi.py +++ b/tests/dictionaries/45multi_family/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="variable", doc="variable", properties=frozenset({"normal"})) optiondescription_2 = OptionDescription(name="subfamily", doc="subfamily", children=[option_3], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="base", doc="base", children=[optiondescription_2], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_6 = StrOption(name="variable", doc="variable", properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="subfamily", doc="subfamily", children=[option_6], properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="base", doc="base", children=[optiondescription_5], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/45multi_family_basic/tiramisu/base.py b/tests/dictionaries/45multi_family_basic/tiramisu/base.py index 322d460b6..1211d4669 100644 --- a/tests/dictionaries/45multi_family_basic/tiramisu/base.py +++ b/tests/dictionaries/45multi_family_basic/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="variable", doc="variable", properties=frozenset({"basic"})) optiondescription_2 = OptionDescription(name="subfamily", doc="subfamily", children=[option_3], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="base", doc="base", children=[optiondescription_2], properties=frozenset({"basic"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/45multi_family_basic/tiramisu/multi.py b/tests/dictionaries/45multi_family_basic/tiramisu/multi.py index a8dc99a48..9a9fc8661 100644 --- a/tests/dictionaries/45multi_family_basic/tiramisu/multi.py +++ b/tests/dictionaries/45multi_family_basic/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="variable", doc="variable", properties=frozenset({"basic"})) optiondescription_2 = OptionDescription(name="subfamily", doc="subfamily", children=[option_3], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="base", doc="base", children=[optiondescription_2], properties=frozenset({"basic"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_6 = StrOption(name="variable", doc="variable", properties=frozenset({"basic"})) optiondescription_5 = OptionDescription(name="subfamily", doc="subfamily", children=[option_6], properties=frozenset({"basic"})) optiondescription_4 = OptionDescription(name="base", doc="base", children=[optiondescription_5], properties=frozenset({"basic"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"basic"})) 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/45multi_family_expert/tiramisu/base.py b/tests/dictionaries/45multi_family_expert/tiramisu/base.py index 7e629e86e..06af5ad5e 100644 --- a/tests/dictionaries/45multi_family_expert/tiramisu/base.py +++ b/tests/dictionaries/45multi_family_expert/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="variable", doc="variable", properties=frozenset({"expert"})) optiondescription_2 = OptionDescription(name="subfamily", doc="subfamily", children=[option_3], properties=frozenset({"expert"})) optiondescription_1 = OptionDescription(name="base", doc="base", children=[optiondescription_2], properties=frozenset({"expert"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"expert"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/45multi_family_expert/tiramisu/multi.py b/tests/dictionaries/45multi_family_expert/tiramisu/multi.py index f6c6129f6..33913f4bb 100644 --- a/tests/dictionaries/45multi_family_expert/tiramisu/multi.py +++ b/tests/dictionaries/45multi_family_expert/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_3 = StrOption(name="variable", doc="variable", properties=frozenset({"expert"})) optiondescription_2 = OptionDescription(name="subfamily", doc="subfamily", children=[option_3], properties=frozenset({"expert"})) optiondescription_1 = OptionDescription(name="base", doc="base", children=[optiondescription_2], properties=frozenset({"expert"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"expert"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_6 = StrOption(name="variable", doc="variable", properties=frozenset({"expert"})) optiondescription_5 = OptionDescription(name="subfamily", doc="subfamily", children=[option_6], properties=frozenset({"expert"})) optiondescription_4 = OptionDescription(name="base", doc="base", children=[optiondescription_5], properties=frozenset({"expert"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"expert"})) 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/45multi_family_order/tiramisu/base.py b/tests/dictionaries/45multi_family_order/tiramisu/base.py index 3c5197dae..9ed4f8e72 100644 --- a/tests/dictionaries/45multi_family_order/tiramisu/base.py +++ b/tests/dictionaries/45multi_family_order/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="variable1", doc="variable1", properties=frozenset({"normal"})) option_3 = StrOption(name="variable2", doc="variable2", properties=frozenset({"normal"})) option_5 = StrOption(name="variable3", doc="variable3", properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="subfamily", doc="subfamily", children=[option_5], properties=frozenset({"normal"})) option_6 = StrOption(name="variable4", doc="variable4", properties=frozenset({"normal"})) optiondescription_2 = OptionDescription(name="base", doc="base", children=[option_3, optiondescription_4, option_6], properties=frozenset({"normal"})) -optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7]) diff --git a/tests/dictionaries/45multi_family_order/tiramisu/multi.py b/tests/dictionaries/45multi_family_order/tiramisu/multi.py index f46b2fbc7..3c64b9712 100644 --- a/tests/dictionaries/45multi_family_order/tiramisu/multi.py +++ b/tests/dictionaries/45multi_family_order/tiramisu/multi.py @@ -16,15 +16,20 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="variable1", doc="variable1", properties=frozenset({"normal"})) option_3 = StrOption(name="variable2", doc="variable2", properties=frozenset({"normal"})) option_5 = StrOption(name="variable3", doc="variable3", properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="subfamily", doc="subfamily", children=[option_5], properties=frozenset({"normal"})) option_6 = StrOption(name="variable4", doc="variable4", properties=frozenset({"normal"})) optiondescription_2 = OptionDescription(name="base", doc="base", children=[option_3, optiondescription_4, option_6], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, optiondescription_2], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14]) option_7 = StrOption(name="variable1", doc="variable1", properties=frozenset({"normal"})) option_9 = StrOption(name="variable2", doc="variable2", properties=frozenset({"normal"})) @@ -32,6 +37,6 @@ option_11 = StrOption(name="variable3", doc="variable3", properties=frozenset({" optiondescription_10 = OptionDescription(name="subfamily", doc="subfamily", children=[option_11], properties=frozenset({"normal"})) option_12 = StrOption(name="variable4", doc="variable4", properties=frozenset({"normal"})) optiondescription_8 = OptionDescription(name="base", doc="base", children=[option_9, optiondescription_10, option_12], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, optiondescription_8]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, optiondescription_8], properties=frozenset({"normal"})) 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/45without_family/tiramisu/base.py b/tests/dictionaries/45without_family/tiramisu/base.py index 23b1b1f2f..7106e847b 100644 --- a/tests/dictionaries/45without_family/tiramisu/base.py +++ b/tests/dictionaries/45without_family/tiramisu/base.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="variable", doc="variable", properties=frozenset({"normal"})) -optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_2]) diff --git a/tests/dictionaries/45without_family/tiramisu/multi.py b/tests/dictionaries/45without_family/tiramisu/multi.py index 96afe4c16..dfd6cb29a 100644 --- a/tests/dictionaries/45without_family/tiramisu/multi.py +++ b/tests/dictionaries/45without_family/tiramisu/multi.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="variable", doc="variable", properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="1", doc="1", children=[optiondescription_4]) option_2 = StrOption(name="variable", doc="variable", properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3, optiondescription_5]) diff --git a/tests/dictionaries/50exists_exists/tiramisu/base.py b/tests/dictionaries/50exists_exists/tiramisu/base.py index 78c34d743..a729cdeef 100644 --- a/tests/dictionaries/50exists_exists/tiramisu/base.py +++ b/tests/dictionaries/50exists_exists/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", 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"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/50exists_exists/tiramisu/multi.py b/tests/dictionaries/50exists_exists/tiramisu/multi.py index 71a9edaae..83aa99a96 100644 --- a/tests/dictionaries/50exists_exists/tiramisu/multi.py +++ b/tests/dictionaries/50exists_exists/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", 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"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/50redefine_description/tiramisu/base.py b/tests/dictionaries/50redefine_description/tiramisu/base.py index 9195203c9..bb48c7339 100644 --- a/tests/dictionaries/50redefine_description/tiramisu/base.py +++ b/tests/dictionaries/50redefine_description/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefined", 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"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/50redefine_description/tiramisu/multi.py b/tests/dictionaries/50redefine_description/tiramisu/multi.py index 918aba7f9..dc3fc4ed7 100644 --- a/tests/dictionaries/50redefine_description/tiramisu/multi.py +++ b/tests/dictionaries/50redefine_description/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefined", 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"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Redefined", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/51exists_nonexists/tiramisu/base.py b/tests/dictionaries/51exists_nonexists/tiramisu/base.py index 206f0b5ff..db5e1c125 100644 --- a/tests/dictionaries/51exists_nonexists/tiramisu/base.py +++ b/tests/dictionaries/51exists_nonexists/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="Description", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="New description", default="oui", properties=frozenset({"mandatory", "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]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5]) diff --git a/tests/dictionaries/51exists_nonexists/tiramisu/multi.py b/tests/dictionaries/51exists_nonexists/tiramisu/multi.py index 40b403fc9..3ecf9c7e9 100644 --- a/tests/dictionaries/51exists_nonexists/tiramisu/multi.py +++ b/tests/dictionaries/51exists_nonexists/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="Description", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif2", doc="New description", default="oui", properties=frozenset({"mandatory", "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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10]) option_6 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="mode_conteneur_actif1", doc="Description", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_8 = StrOption(name="mode_conteneur_actif2", doc="New description", default="oui", properties=frozenset({"mandatory", "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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) 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/51exists_redefine/tiramisu/base.py b/tests/dictionaries/51exists_redefine/tiramisu/base.py index a8d1b898f..0962ea27d 100644 --- a/tests/dictionaries/51exists_redefine/tiramisu/base.py +++ b/tests/dictionaries/51exists_redefine/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/51exists_redefine/tiramisu/multi.py b/tests/dictionaries/51exists_redefine/tiramisu/multi.py index 646dc6105..9712639f6 100644 --- a/tests/dictionaries/51exists_redefine/tiramisu/multi.py +++ b/tests/dictionaries/51exists_redefine/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Description", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Description", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/51redefine_auto/tiramisu/base.py b/tests/dictionaries/51redefine_auto/tiramisu/base.py index 81f94fa0a..d1d7373a3 100644 --- a/tests/dictionaries/51redefine_auto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_auto/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/51redefine_auto/tiramisu/multi.py b/tests/dictionaries/51redefine_auto/tiramisu/multi.py index 6d3718deb..d498b9969 100644 --- a/tests/dictionaries/51redefine_auto/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_auto/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/51redefine_autofill/tiramisu/base.py b/tests/dictionaries/51redefine_autofill/tiramisu/base.py index a514607a1..dc967fdcb 100644 --- a/tests/dictionaries/51redefine_autofill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_autofill/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/51redefine_autofill/tiramisu/multi.py b/tests/dictionaries/51redefine_autofill/tiramisu/multi.py index d7fc0bfe5..19c79d37a 100644 --- a/tests/dictionaries/51redefine_autofill/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_autofill/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/51redefine_family/tiramisu/base.py b/tests/dictionaries/51redefine_family/tiramisu/base.py index ab4c8736e..88755320b 100644 --- a/tests/dictionaries/51redefine_family/tiramisu/base.py +++ b/tests/dictionaries/51redefine_family/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) 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 d712a084d..f86eeacb6 100644 --- a/tests/dictionaries/51redefine_family/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_family/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1, optiondescription_3], properties=frozenset({"normal"})) 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, notraisepropertyerror=True), 'expected': ParamValue("oui")}), func.calc_value_property_help)})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5, optiondescription_7], properties=frozenset({"normal"})) 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_fill/tiramisu/base.py b/tests/dictionaries/51redefine_fill/tiramisu/base.py index 81f94fa0a..d1d7373a3 100644 --- a/tests/dictionaries/51redefine_fill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fill/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/51redefine_fill/tiramisu/multi.py b/tests/dictionaries/51redefine_fill/tiramisu/multi.py index 6d3718deb..d498b9969 100644 --- a/tests/dictionaries/51redefine_fill/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_fill/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/51redefine_fillauto/tiramisu/base.py b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py index 81f94fa0a..d1d7373a3 100644 --- a/tests/dictionaries/51redefine_fillauto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/51redefine_fillauto/tiramisu/multi.py b/tests/dictionaries/51redefine_fillauto/tiramisu/multi.py index 6d3718deb..d498b9969 100644 --- a/tests/dictionaries/51redefine_fillauto/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_fillauto/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/51redefine_help/tiramisu/base.py b/tests/dictionaries/51redefine_help/tiramisu/base.py index ea41aef7d..31e60762e 100644 --- a/tests/dictionaries/51redefine_help/tiramisu/base.py +++ b/tests/dictionaries/51redefine_help/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="redefine help", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_2.impl_set_information('help', "redefine help ok") optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) optiondescription_1.impl_set_information('help', "redefine help family ok") -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/51redefine_help/tiramisu/multi.py b/tests/dictionaries/51redefine_help/tiramisu/multi.py index 6a3deb807..10a016d66 100644 --- a/tests/dictionaries/51redefine_help/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_help/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="redefine help", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_2.impl_set_information('help', "redefine help ok") optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) optiondescription_1.impl_set_information('help', "redefine help family ok") -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="redefine help", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_4.impl_set_information('help', "redefine help ok") optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) optiondescription_3.impl_set_information('help', "redefine help family ok") -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/51redefine_hidden/tiramisu/base.py b/tests/dictionaries/51redefine_hidden/tiramisu/base.py index e5d65662c..175a6e850 100644 --- a/tests/dictionaries/51redefine_hidden/tiramisu/base.py +++ b/tests/dictionaries/51redefine_hidden/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine hidden", 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"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/51redefine_hidden/tiramisu/multi.py b/tests/dictionaries/51redefine_hidden/tiramisu/multi.py index 138112a16..a6e2a62b5 100644 --- a/tests/dictionaries/51redefine_hidden/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_hidden/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine hidden", 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"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine hidden", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/51redefine_hidden_inverse/__init__.py b/tests/dictionaries/51redefine_hidden_inverse/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/51redefine_hidden_inverse/makedict/after.json b/tests/dictionaries/51redefine_hidden_inverse/makedict/after.json new file mode 100644 index 000000000..2e6c541d0 --- /dev/null +++ b/tests/dictionaries/51redefine_hidden_inverse/makedict/after.json @@ -0,0 +1,6 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + } +} diff --git a/tests/dictionaries/51redefine_hidden_inverse/makedict/base.json b/tests/dictionaries/51redefine_hidden_inverse/makedict/base.json new file mode 100644 index 000000000..25056378d --- /dev/null +++ b/tests/dictionaries/51redefine_hidden_inverse/makedict/base.json @@ -0,0 +1,3 @@ +{ + "rougail.general.mode_conteneur_actif": "non" +} diff --git a/tests/dictionaries/51redefine_hidden_inverse/makedict/before.json b/tests/dictionaries/51redefine_hidden_inverse/makedict/before.json new file mode 100644 index 000000000..2e6c541d0 --- /dev/null +++ b/tests/dictionaries/51redefine_hidden_inverse/makedict/before.json @@ -0,0 +1,6 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + } +} diff --git a/tests/dictionaries/51redefine_hidden_inverse/tiramisu/base.py b/tests/dictionaries/51redefine_hidden_inverse/tiramisu/base.py new file mode 100644 index 000000000..1056d3922 --- /dev/null +++ b/tests/dictionaries/51redefine_hidden_inverse/tiramisu/base.py @@ -0,0 +1,29 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine hidden", default="non", properties=frozenset({"mandatory", "normal"})) +optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/51redefine_hidden_inverse/tiramisu/multi.py b/tests/dictionaries/51redefine_hidden_inverse/tiramisu/multi.py new file mode 100644 index 000000000..043f8dd4f --- /dev/null +++ b/tests/dictionaries/51redefine_hidden_inverse/tiramisu/multi.py @@ -0,0 +1,34 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine hidden", default="non", properties=frozenset({"mandatory", "normal"})) +optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) +option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine hidden", default="non", properties=frozenset({"mandatory", "normal"})) +optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) +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/51redefine_hidden_inverse/xml/00-base.xml b/tests/dictionaries/51redefine_hidden_inverse/xml/00-base.xml new file mode 100644 index 000000000..747f91891 --- /dev/null +++ b/tests/dictionaries/51redefine_hidden_inverse/xml/00-base.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/tests/dictionaries/51redefine_hidden_inverse/xml/01-redefine.xml b/tests/dictionaries/51redefine_hidden_inverse/xml/01-redefine.xml new file mode 100644 index 000000000..1856b0786 --- /dev/null +++ b/tests/dictionaries/51redefine_hidden_inverse/xml/01-redefine.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/tests/dictionaries/51redefine_hidden_inverse/yml/00-base.yml b/tests/dictionaries/51redefine_hidden_inverse/yml/00-base.yml new file mode 100644 index 000000000..de998be8b --- /dev/null +++ b/tests/dictionaries/51redefine_hidden_inverse/yml/00-base.yml @@ -0,0 +1,12 @@ +version: '0.10' +variables: +- family: + - name: general + variables: + - variable: + - name: mode_conteneur_actif + type: string + description: Redefine hidden + hidden: true + value: + - text: non diff --git a/tests/dictionaries/51redefine_hidden_inverse/yml/01-redefine.yml b/tests/dictionaries/51redefine_hidden_inverse/yml/01-redefine.yml new file mode 100644 index 000000000..774eb4936 --- /dev/null +++ b/tests/dictionaries/51redefine_hidden_inverse/yml/01-redefine.yml @@ -0,0 +1,9 @@ +version: '0.10' +variables: +- family: + - name: general + variables: + - variable: + - name: mode_conteneur_actif + redefine: true + hidden: false diff --git a/tests/dictionaries/51redefine_multi/tiramisu/base.py b/tests/dictionaries/51redefine_multi/tiramisu/base.py index c989bb60b..5fc55cc43 100644 --- a/tests/dictionaries/51redefine_multi/tiramisu/base.py +++ b/tests/dictionaries/51redefine_multi/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/51redefine_multi/tiramisu/multi.py b/tests/dictionaries/51redefine_multi/tiramisu/multi.py index 30b49e21a..4b92ec1d2 100644 --- a/tests/dictionaries/51redefine_multi/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_multi/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine description", multi=True, default=['non'], default_multi="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/51redefine_remove_condition/tiramisu/base.py b/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py index 3d8ca30be..ff92fb48f 100644 --- a/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py +++ b/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) 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]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/51redefine_remove_condition/tiramisu/multi.py b/tests/dictionaries/51redefine_remove_condition/tiramisu/multi.py index 1532fa572..a297535ed 100644 --- a/tests/dictionaries/51redefine_remove_condition/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_remove_condition/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_10 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) 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_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/51redefine_remove_condition_filelist/tiramisu/base.py b/tests/dictionaries/51redefine_remove_condition_filelist/tiramisu/base.py index 86bc1ebde..8a9721d1a 100644 --- a/tests/dictionaries/51redefine_remove_condition_filelist/tiramisu/base.py +++ b/tests/dictionaries/51redefine_remove_condition_filelist/tiramisu/base.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4, option_5], properties=frozenset({"normal"})) -optiondescription_13 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_13 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_10 = FilenameOption(name="name", doc="name", default="/etc/file") option_11 = StrOption(name="source", doc="source", default="file") option_9 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/51redefine_remove_condition_filelist/tiramisu/multi.py b/tests/dictionaries/51redefine_remove_condition_filelist/tiramisu/multi.py index 674f7f4a4..6ba5a8f4b 100644 --- a/tests/dictionaries/51redefine_remove_condition_filelist/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_remove_condition_filelist/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3, option_4, option_5], properties=frozenset({"normal"})) -optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_15 = FilenameOption(name="name", doc="name", default="/etc/file") option_16 = StrOption(name="source", doc="source", default="file") option_14 = BoolOption(name="activate", doc="activate", default=True) @@ -40,7 +45,7 @@ option_8 = StrOption(name="condition", doc="No change", default="non", propertie option_9 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_10 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_6 = OptionDescription(name="general", doc="general", children=[option_7, option_8, option_9, option_10], properties=frozenset({"normal"})) -optiondescription_30 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6]) +optiondescription_30 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) option_22 = FilenameOption(name="name", doc="name", default="/etc/file") option_23 = StrOption(name="source", doc="source", default="file") option_21 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py index d41a45c93..c847559cd 100644 --- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py +++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3, option_4, option_5]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3, option_4, option_5], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6]) diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/multi.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/multi.py index 897f3bfad..322d5fcbb 100644 --- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3, option_4, option_5], properties=frozenset({"basic"})) 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, 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"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[option_6, option_7, option_8, option_9, option_10]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[option_6, option_7, option_8, option_9, option_10], properties=frozenset({"basic"})) optiondescription_13 = OptionDescription(name="2", doc="2", children=[optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_13]) diff --git a/tests/dictionaries/51redefine_validenum/tiramisu/base.py b/tests/dictionaries/51redefine_validenum/tiramisu/base.py index dcdacd4ff..a21034e86 100644 --- a/tests/dictionaries/51redefine_validenum/tiramisu/base.py +++ b/tests/dictionaries/51redefine_validenum/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = ChoiceOption(name="mode_conteneur_actif", doc="Redefine description", values=('a', 'b'), default="a", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/51redefine_validenum/tiramisu/multi.py b/tests/dictionaries/51redefine_validenum/tiramisu/multi.py index 44d0ba6bc..8ad7153cd 100644 --- a/tests/dictionaries/51redefine_validenum/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_validenum/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = ChoiceOption(name="mode_conteneur_actif", doc="Redefine description", values=('a', 'b'), default="a", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = ChoiceOption(name="mode_conteneur_actif", doc="Redefine description", values=('a', 'b'), default="a", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/51redefine_value/tiramisu/base.py b/tests/dictionaries/51redefine_value/tiramisu/base.py index 15f9729e5..01cc1c3a7 100644 --- a/tests/dictionaries/51redefine_value/tiramisu/base.py +++ b/tests/dictionaries/51redefine_value/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine value", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="Redefine value", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/51redefine_value/tiramisu/multi.py b/tests/dictionaries/51redefine_value/tiramisu/multi.py index 825358410..fe18720ab 100644 --- a/tests/dictionaries/51redefine_value/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_value/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine value", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="Redefine value", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="mode_conteneur_actif", doc="Redefine value", default="non", properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="mode_conteneur_actif1", doc="Redefine value", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/51redefine_without_hidden/__init__.py b/tests/dictionaries/51redefine_without_hidden/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/51redefine_without_hidden/makedict/after.json b/tests/dictionaries/51redefine_without_hidden/makedict/after.json new file mode 100644 index 000000000..2e6c541d0 --- /dev/null +++ b/tests/dictionaries/51redefine_without_hidden/makedict/after.json @@ -0,0 +1,6 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + } +} diff --git a/tests/dictionaries/51redefine_without_hidden/makedict/base.json b/tests/dictionaries/51redefine_without_hidden/makedict/base.json new file mode 100644 index 000000000..25056378d --- /dev/null +++ b/tests/dictionaries/51redefine_without_hidden/makedict/base.json @@ -0,0 +1,3 @@ +{ + "rougail.general.mode_conteneur_actif": "non" +} diff --git a/tests/dictionaries/51redefine_without_hidden/makedict/before.json b/tests/dictionaries/51redefine_without_hidden/makedict/before.json new file mode 100644 index 000000000..2e6c541d0 --- /dev/null +++ b/tests/dictionaries/51redefine_without_hidden/makedict/before.json @@ -0,0 +1,6 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + } +} diff --git a/tests/dictionaries/51redefine_without_hidden/tiramisu/base.py b/tests/dictionaries/51redefine_without_hidden/tiramisu/base.py new file mode 100644 index 000000000..175a6e850 --- /dev/null +++ b/tests/dictionaries/51redefine_without_hidden/tiramisu/base.py @@ -0,0 +1,29 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine hidden", 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"})) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/51redefine_without_hidden/tiramisu/multi.py b/tests/dictionaries/51redefine_without_hidden/tiramisu/multi.py new file mode 100644 index 000000000..a6e2a62b5 --- /dev/null +++ b/tests/dictionaries/51redefine_without_hidden/tiramisu/multi.py @@ -0,0 +1,34 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +option_2 = StrOption(name="mode_conteneur_actif", doc="Redefine hidden", 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"})) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) +option_4 = StrOption(name="mode_conteneur_actif", doc="Redefine hidden", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) +optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) +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/51redefine_without_hidden/xml/00-base.xml b/tests/dictionaries/51redefine_without_hidden/xml/00-base.xml new file mode 100644 index 000000000..747f91891 --- /dev/null +++ b/tests/dictionaries/51redefine_without_hidden/xml/00-base.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/tests/dictionaries/51redefine_without_hidden/xml/01-redefine.xml b/tests/dictionaries/51redefine_without_hidden/xml/01-redefine.xml new file mode 100644 index 000000000..8e94f5212 --- /dev/null +++ b/tests/dictionaries/51redefine_without_hidden/xml/01-redefine.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/tests/dictionaries/51redefine_without_hidden/yml/00-base.yml b/tests/dictionaries/51redefine_without_hidden/yml/00-base.yml new file mode 100644 index 000000000..de998be8b --- /dev/null +++ b/tests/dictionaries/51redefine_without_hidden/yml/00-base.yml @@ -0,0 +1,12 @@ +version: '0.10' +variables: +- family: + - name: general + variables: + - variable: + - name: mode_conteneur_actif + type: string + description: Redefine hidden + hidden: true + value: + - text: non diff --git a/tests/dictionaries/51redefine_without_hidden/yml/01-redefine.yml b/tests/dictionaries/51redefine_without_hidden/yml/01-redefine.yml new file mode 100644 index 000000000..55007491c --- /dev/null +++ b/tests/dictionaries/51redefine_without_hidden/yml/01-redefine.yml @@ -0,0 +1,8 @@ +version: '0.10' +variables: +- family: + - name: general + variables: + - variable: + - name: mode_conteneur_actif + redefine: true diff --git a/tests/dictionaries/51remove_fill/tiramisu/base.py b/tests/dictionaries/51remove_fill/tiramisu/base.py index f836b8802..2969d3916 100644 --- a/tests/dictionaries/51remove_fill/tiramisu/base.py +++ b/tests/dictionaries/51remove_fill/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_4]) diff --git a/tests/dictionaries/51remove_fill/tiramisu/multi.py b/tests/dictionaries/51remove_fill/tiramisu/multi.py index 29de8df51..1e6d06443 100644 --- a/tests/dictionaries/51remove_fill/tiramisu/multi.py +++ b/tests/dictionaries/51remove_fill/tiramisu/multi.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="general", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8]) option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="general", doc="general", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) 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/52exists_redefine/tiramisu/base.py b/tests/dictionaries/52exists_redefine/tiramisu/base.py index d4fe335c9..517001976 100644 --- a/tests/dictionaries/52exists_redefine/tiramisu/base.py +++ b/tests/dictionaries/52exists_redefine/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="New description", 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"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/52exists_redefine/tiramisu/multi.py b/tests/dictionaries/52exists_redefine/tiramisu/multi.py index c965551a0..3d05a8281 100644 --- a/tests/dictionaries/52exists_redefine/tiramisu/multi.py +++ b/tests/dictionaries/52exists_redefine/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="New description", 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"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="New description", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/60action_external/tiramisu/base.py b/tests/dictionaries/60action_external/tiramisu/base.py index bfe32cb8f..abff63b56 100644 --- a/tests/dictionaries/60action_external/tiramisu/base.py +++ b/tests/dictionaries/60action_external/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_4 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"})) option_5 = URLOption(name="calc_url", doc="domain", default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")))), allow_ip=True, allow_without_dot=True, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_3 = OptionDescription(name="test", doc="test", children=[option_4, option_5], properties=frozenset({"normal"})) -optiondescription_7 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3]) +optiondescription_7 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6, optiondescription_7]) diff --git a/tests/dictionaries/60action_external/tiramisu/multi.py b/tests/dictionaries/60action_external/tiramisu/multi.py index e18362915..377038444 100644 --- a/tests/dictionaries/60action_external/tiramisu/multi.py +++ b/tests/dictionaries/60action_external/tiramisu/multi.py @@ -16,22 +16,27 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_4 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"})) option_5 = URLOption(name="calc_url", doc="domain", default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")))), allow_ip=True, allow_without_dot=True, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_3 = OptionDescription(name="test", doc="test", children=[option_4, option_5], properties=frozenset({"normal"})) -optiondescription_13 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3]) +optiondescription_13 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12, optiondescription_13]) 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="général", children=[option_7], properties=frozenset({"normal"})) -optiondescription_15 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6]) +optiondescription_15 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) option_9 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"})) option_10 = URLOption(name="calc_url", doc="domain", default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")))), allow_ip=True, allow_without_dot=True, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal"})) optiondescription_8 = OptionDescription(name="test", doc="test", children=[option_9, option_10], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="extra", doc="extra", children=[optiondescription_8]) +optiondescription_16 = OptionDescription(name="extra", doc="extra", children=[optiondescription_8], properties=frozenset({"normal"})) optiondescription_14 = OptionDescription(name="2", doc="2", children=[optiondescription_15, optiondescription_16]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_14]) diff --git a/tests/dictionaries/60extra_basic/__init__.py b/tests/dictionaries/60extra_basic/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/60extra_basic/makedict/after.json b/tests/dictionaries/60extra_basic/makedict/after.json new file mode 100644 index 000000000..383ce0931 --- /dev/null +++ b/tests/dictionaries/60extra_basic/makedict/after.json @@ -0,0 +1,22 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + }, + "rougail.general.activer_ejabberd": { + "owner": "default", + "value": "non" + }, + "extra.ejabberd.description": { + "owner": "default", + "value": "Exportation de la base de ejabberd" + }, + "extra.ejabberd.day": { + "owner": "default", + "value": null + }, + "extra.ejabberd.mode": { + "owner": "default", + "value": "pre" + } +} diff --git a/tests/dictionaries/60extra_basic/makedict/base.json b/tests/dictionaries/60extra_basic/makedict/base.json new file mode 100644 index 000000000..242a818de --- /dev/null +++ b/tests/dictionaries/60extra_basic/makedict/base.json @@ -0,0 +1,7 @@ +{ + "rougail.general.mode_conteneur_actif": "non", + "rougail.general.activer_ejabberd": "non", + "extra.ejabberd.description": "Exportation de la base de ejabberd", + "extra.ejabberd.day": null, + "extra.ejabberd.mode": "pre" +} diff --git a/tests/dictionaries/60extra_basic/makedict/before.json b/tests/dictionaries/60extra_basic/makedict/before.json new file mode 100644 index 000000000..383ce0931 --- /dev/null +++ b/tests/dictionaries/60extra_basic/makedict/before.json @@ -0,0 +1,22 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + }, + "rougail.general.activer_ejabberd": { + "owner": "default", + "value": "non" + }, + "extra.ejabberd.description": { + "owner": "default", + "value": "Exportation de la base de ejabberd" + }, + "extra.ejabberd.day": { + "owner": "default", + "value": null + }, + "extra.ejabberd.mode": { + "owner": "default", + "value": "pre" + } +} diff --git a/tests/dictionaries/60extra_basic/tiramisu/base.py b/tests/dictionaries/60extra_basic/tiramisu/base.py new file mode 100644 index 000000000..53b8d0323 --- /dev/null +++ b/tests/dictionaries/60extra_basic/tiramisu/base.py @@ -0,0 +1,35 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) +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_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_5 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"basic", "mandatory"})) +option_6 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) +option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) +optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5, option_6, option_7], properties=frozenset({"basic"})) +optiondescription_9 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8, optiondescription_9]) diff --git a/tests/dictionaries/60extra_basic/tiramisu/multi.py b/tests/dictionaries/60extra_basic/tiramisu/multi.py new file mode 100644 index 000000000..1a6c830e4 --- /dev/null +++ b/tests/dictionaries/60extra_basic/tiramisu/multi.py @@ -0,0 +1,46 @@ +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +class func: + pass + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + setattr(func, function, getattr(func_, function)) +_load_functions('tests/dictionaries/../eosfunc/test.py') +try: + from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES +except: + from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) +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_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_5 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"basic", "mandatory"})) +option_6 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) +option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) +optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5, option_6, option_7], properties=frozenset({"basic"})) +optiondescription_17 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"basic"})) +optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16, optiondescription_17]) +option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) +option_10 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) +optiondescription_8 = OptionDescription(name="general", doc="général", children=[option_9, option_10], properties=frozenset({"normal"})) +optiondescription_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"normal"})) +option_12 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"basic", "mandatory"})) +option_13 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_10, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) +option_14 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) +optiondescription_11 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_12, option_13, option_14], properties=frozenset({"basic"})) +optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11], properties=frozenset({"basic"})) +optiondescription_18 = OptionDescription(name="2", doc="2", children=[optiondescription_19, optiondescription_20]) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_18]) diff --git a/tests/dictionaries/60extra_basic/xml/00-base.xml b/tests/dictionaries/60extra_basic/xml/00-base.xml new file mode 100644 index 000000000..cb25aa750 --- /dev/null +++ b/tests/dictionaries/60extra_basic/xml/00-base.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/tests/dictionaries/60extra_basic/xml/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_basic/xml/extra_dirs/extra/00-base.xml new file mode 100644 index 000000000..6c643bda5 --- /dev/null +++ b/tests/dictionaries/60extra_basic/xml/extra_dirs/extra/00-base.xml @@ -0,0 +1,31 @@ + + + + + + Exportation de la base de ejabberd + + + none + daily + weekly + monthly + none + + + pre + pre + post + + + + + + non + activer_ejabberd + none + daily + extra.ejabberd.day + + + diff --git a/tests/dictionaries/60extra_basic/yml/00-base.yml b/tests/dictionaries/60extra_basic/yml/00-base.yml new file mode 100644 index 000000000..f1fcfb050 --- /dev/null +++ b/tests/dictionaries/60extra_basic/yml/00-base.yml @@ -0,0 +1,19 @@ +version: '0.10' +variables: +- family: + - name: general + description: "g\xE9n\xE9ral" + variables: + - variable: + - name: mode_conteneur_actif + type: string + description: No change + hidden: true + value: + - text: non + - name: activer_ejabberd + type: string + description: No change + hidden: true + value: + - text: non diff --git a/tests/dictionaries/60extra_basic/yml/extra_dirs/extra/00-base.yml b/tests/dictionaries/60extra_basic/yml/extra_dirs/extra/00-base.yml new file mode 100644 index 000000000..91773cf92 --- /dev/null +++ b/tests/dictionaries/60extra_basic/yml/extra_dirs/extra/00-base.yml @@ -0,0 +1,44 @@ +version: '0.10' +variables: +- family: + - name: ejabberd + variables: + - variable: + - name: description + type: string + mode: basic + value: + - text: Exportation de la base de ejabberd + - name: day + type: choice + mandatory: true + choice: + - text: none + - text: daily + - text: weekly + - text: monthly + value: + - text: none + - name: mode + type: choice + mandatory: true + value: + - text: pre + choice: + - text: pre + - text: post +constraints: +- fill: + - name: calc_multi_condition + param: + - text: non + - type: variable + name: condition_1 + propertyerror: false + text: activer_ejabberd + - name: match + text: none + - name: mismatch + text: daily + target: + - text: extra.ejabberd.day diff --git a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py index 3da7c9a4a..82820ba11 100644 --- a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py +++ b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py @@ -16,19 +16,24 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) option_6 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default="none", properties=frozenset({"mandatory", "normal"})) option_8 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) 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]) +optiondescription_12 = OptionDescription(name="extra", doc="extra", children=[optiondescription_5], properties=frozenset({"normal"})) 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, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) -optiondescription_13 = OptionDescription(name="extra1", doc="extra1", children=[optiondescription_9]) +optiondescription_13 = OptionDescription(name="extra1", doc="extra1", children=[optiondescription_9], properties=frozenset({"normal"})) 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 e9bf5faa3..d0b77a119 100644 --- a/tests/dictionaries/60extra_externalspacecondition/tiramisu/multi.py +++ b/tests/dictionaries/60extra_externalspacecondition/tiramisu/multi.py @@ -16,34 +16,39 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, 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]) +optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"basic"})) option_6 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default="none", properties=frozenset({"mandatory", "normal"})) option_8 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) 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]) +optiondescription_23 = OptionDescription(name="extra", doc="extra", children=[optiondescription_5], properties=frozenset({"normal"})) 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, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) -optiondescription_24 = OptionDescription(name="extra1", doc="extra1", children=[optiondescription_9]) +optiondescription_24 = OptionDescription(name="extra1", doc="extra1", children=[optiondescription_9], properties=frozenset({"normal"})) 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, 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]) +optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_11], properties=frozenset({"basic"})) option_16 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_17 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default="none", properties=frozenset({"mandatory", "normal"})) option_18 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) 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]) +optiondescription_27 = OptionDescription(name="extra", doc="extra", children=[optiondescription_15], properties=frozenset({"normal"})) 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, notraisepropertyerror=True), 'expected': ParamValue("non")}), func.calc_value_property_help)})) -optiondescription_28 = OptionDescription(name="extra1", doc="extra1", children=[optiondescription_19]) +optiondescription_28 = OptionDescription(name="extra1", doc="extra1", children=[optiondescription_19], properties=frozenset({"normal"})) 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/60extra_help/tiramisu/base.py b/tests/dictionaries/60extra_help/tiramisu/base.py index eca6f3283..003d999c1 100644 --- a/tests/dictionaries/60extra_help/tiramisu/base.py +++ b/tests/dictionaries/60extra_help/tiramisu/base.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_15 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_15 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_6 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_6.impl_set_information('help', "Test help") option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_16 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) option_12 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_13 = StrOption(name="source", doc="source", default="mailname") option_11 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/60extra_help/tiramisu/multi.py b/tests/dictionaries/60extra_help/tiramisu/multi.py index 05983f47e..5d5e0b29c 100644 --- a/tests/dictionaries/60extra_help/tiramisu/multi.py +++ b/tests/dictionaries/60extra_help/tiramisu/multi.py @@ -16,18 +16,23 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_30 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_30 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_6 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_6.impl_set_information('help', "Test help") option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) -optiondescription_31 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_31 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) option_19 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_20 = StrOption(name="source", doc="source", default="mailname") option_18 = BoolOption(name="activate", doc="activate", default=True) @@ -42,13 +47,13 @@ optiondescription_29 = OptionDescription(name="1", doc="1", children=[optiondesc option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_10 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_8 = OptionDescription(name="general", doc="général", children=[option_9, option_10], properties=frozenset({"normal"})) -optiondescription_35 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8]) +optiondescription_35 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"normal"})) option_12 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_13 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_10, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_13.impl_set_information('help', "Test help") option_14 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_11 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_12, option_13, option_14], properties=frozenset({"normal"})) -optiondescription_36 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11]) +optiondescription_36 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11], properties=frozenset({"normal"})) option_26 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_27 = StrOption(name="source", doc="source", default="mailname") option_25 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/60extra_leadership/tiramisu/base.py b/tests/dictionaries/60extra_leadership/tiramisu/base.py index a0fbaeafc..16ad2e1bb 100644 --- a/tests/dictionaries/60extra_leadership/tiramisu/base.py +++ b/tests/dictionaries/60extra_leadership/tiramisu/base.py @@ -16,17 +16,22 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) -option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"})) +optiondescription_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="mode", doc="mode", multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = Leadership(name="leadership", doc="description", children=[option_6, option_7], properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[optiondescription_5], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) option_12 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_13 = StrOption(name="source", doc="source", default="mailname") option_11 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/60extra_leadership/tiramisu/multi.py b/tests/dictionaries/60extra_leadership/tiramisu/multi.py index 24512c9cb..b434f9136 100644 --- a/tests/dictionaries/60extra_leadership/tiramisu/multi.py +++ b/tests/dictionaries/60extra_leadership/tiramisu/multi.py @@ -16,17 +16,22 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_38 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) -option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"})) +optiondescription_38 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="mode", doc="mode", multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = Leadership(name="leadership", doc="description", children=[option_6, option_7], properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[optiondescription_5], properties=frozenset({"normal"})) -optiondescription_39 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_39 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) option_19 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_20 = StrOption(name="source", doc="source", default="mailname") option_18 = BoolOption(name="activate", doc="activate", default=True) @@ -46,12 +51,12 @@ optiondescription_37 = OptionDescription(name="1", doc="1", children=[optiondesc option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_10 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_8 = OptionDescription(name="general", doc="général", children=[option_9, option_10], properties=frozenset({"normal"})) -optiondescription_43 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8]) -option_13 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"})) +optiondescription_43 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"normal"})) +option_13 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory", "normal"})) option_14 = StrOption(name="mode", doc="mode", multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_12 = Leadership(name="leadership", doc="description", children=[option_13, option_14], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="ejabberd", doc="ejabberd", children=[optiondescription_12], properties=frozenset({"normal"})) -optiondescription_44 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11]) +optiondescription_44 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11], properties=frozenset({"normal"})) option_30 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_31 = StrOption(name="source", doc="source", default="mailname") option_29 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/60extra_leadership_name/tiramisu/base.py b/tests/dictionaries/60extra_leadership_name/tiramisu/base.py index 4c2c12560..e21c2371f 100644 --- a/tests/dictionaries/60extra_leadership_name/tiramisu/base.py +++ b/tests/dictionaries/60extra_leadership_name/tiramisu/base.py @@ -16,17 +16,22 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) -option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"})) +optiondescription_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="mode", doc="mode", multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = Leadership(name="new_name", doc="new_name", children=[option_6, option_7], properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[optiondescription_5], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) option_12 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_13 = StrOption(name="source", doc="source", default="mailname") option_11 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/60extra_leadership_name/tiramisu/multi.py b/tests/dictionaries/60extra_leadership_name/tiramisu/multi.py index e14c31abd..4c800df8d 100644 --- a/tests/dictionaries/60extra_leadership_name/tiramisu/multi.py +++ b/tests/dictionaries/60extra_leadership_name/tiramisu/multi.py @@ -16,17 +16,22 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_38 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) -option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"})) +optiondescription_38 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="mode", doc="mode", multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = Leadership(name="new_name", doc="new_name", children=[option_6, option_7], properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[optiondescription_5], properties=frozenset({"normal"})) -optiondescription_39 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_39 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) option_19 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_20 = StrOption(name="source", doc="source", default="mailname") option_18 = BoolOption(name="activate", doc="activate", default=True) @@ -46,12 +51,12 @@ optiondescription_37 = OptionDescription(name="1", doc="1", children=[optiondesc option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_10 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_8 = OptionDescription(name="general", doc="général", children=[option_9, option_10], properties=frozenset({"normal"})) -optiondescription_43 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8]) -option_13 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"})) +optiondescription_43 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"normal"})) +option_13 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory", "normal"})) option_14 = StrOption(name="mode", doc="mode", multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_12 = Leadership(name="new_name", doc="new_name", children=[option_13, option_14], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="ejabberd", doc="ejabberd", children=[optiondescription_12], properties=frozenset({"normal"})) -optiondescription_44 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11]) +optiondescription_44 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11], properties=frozenset({"normal"})) option_30 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_31 = StrOption(name="source", doc="source", default="mailname") option_29 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/60extra_leadership_name_item/tiramisu/base.py b/tests/dictionaries/60extra_leadership_name_item/tiramisu/base.py index 4c2c12560..e21c2371f 100644 --- a/tests/dictionaries/60extra_leadership_name_item/tiramisu/base.py +++ b/tests/dictionaries/60extra_leadership_name_item/tiramisu/base.py @@ -16,17 +16,22 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) -option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"})) +optiondescription_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="mode", doc="mode", multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = Leadership(name="new_name", doc="new_name", children=[option_6, option_7], properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[optiondescription_5], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) option_12 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_13 = StrOption(name="source", doc="source", default="mailname") option_11 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/60extra_leadership_name_item/tiramisu/multi.py b/tests/dictionaries/60extra_leadership_name_item/tiramisu/multi.py index e14c31abd..4c800df8d 100644 --- a/tests/dictionaries/60extra_leadership_name_item/tiramisu/multi.py +++ b/tests/dictionaries/60extra_leadership_name_item/tiramisu/multi.py @@ -16,17 +16,22 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_38 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) -option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"})) +optiondescription_38 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory", "normal"})) option_7 = StrOption(name="mode", doc="mode", multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = Leadership(name="new_name", doc="new_name", children=[option_6, option_7], properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[optiondescription_5], properties=frozenset({"normal"})) -optiondescription_39 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_39 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) option_19 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_20 = StrOption(name="source", doc="source", default="mailname") option_18 = BoolOption(name="activate", doc="activate", default=True) @@ -46,12 +51,12 @@ optiondescription_37 = OptionDescription(name="1", doc="1", children=[optiondesc option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_10 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_8 = OptionDescription(name="general", doc="général", children=[option_9, option_10], properties=frozenset({"normal"})) -optiondescription_43 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8]) -option_13 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"})) +optiondescription_43 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"normal"})) +option_13 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory", "normal"})) option_14 = StrOption(name="mode", doc="mode", multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_12 = Leadership(name="new_name", doc="new_name", children=[option_13, option_14], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="ejabberd", doc="ejabberd", children=[optiondescription_12], properties=frozenset({"normal"})) -optiondescription_44 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11]) +optiondescription_44 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11], properties=frozenset({"normal"})) option_30 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_31 = StrOption(name="source", doc="source", default="mailname") option_29 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/base.py b/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/base.py index 9a1fdaadc..1afa0353f 100644 --- a/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/base.py +++ b/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/base.py @@ -16,17 +16,22 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) -option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"})) +optiondescription_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = Leadership(name="description", doc="description", children=[option_6, option_7], properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[optiondescription_5], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) option_12 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_13 = StrOption(name="source", doc="source", default="mailname") option_11 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/multi.py b/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/multi.py index 8f6dd653e..ed75dd172 100644 --- a/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/multi.py +++ b/tests/dictionaries/60extra_leadership_valid_enum/tiramisu/multi.py @@ -16,17 +16,22 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_38 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) -option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"})) +optiondescription_38 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) +option_6 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = Leadership(name="description", doc="description", children=[option_6, option_7], properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[optiondescription_5], properties=frozenset({"normal"})) -optiondescription_39 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_39 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) option_19 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_20 = StrOption(name="source", doc="source", default="mailname") option_18 = BoolOption(name="activate", doc="activate", default=True) @@ -46,12 +51,12 @@ optiondescription_37 = OptionDescription(name="1", doc="1", children=[optiondesc option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_10 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_8 = OptionDescription(name="general", doc="général", children=[option_9, option_10], properties=frozenset({"normal"})) -optiondescription_43 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8]) -option_13 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"})) +optiondescription_43 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"normal"})) +option_13 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory", "normal"})) option_14 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_12 = Leadership(name="description", doc="description", children=[option_13, option_14], properties=frozenset({"normal"})) optiondescription_11 = OptionDescription(name="ejabberd", doc="ejabberd", children=[optiondescription_12], properties=frozenset({"normal"})) -optiondescription_44 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11]) +optiondescription_44 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11], properties=frozenset({"normal"})) option_30 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_31 = StrOption(name="source", doc="source", default="mailname") option_29 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/60extra_load/tiramisu/base.py b/tests/dictionaries/60extra_load/tiramisu/base.py index 96989d9c8..deca00e34 100644 --- a/tests/dictionaries/60extra_load/tiramisu/base.py +++ b/tests/dictionaries/60extra_load/tiramisu/base.py @@ -16,15 +16,20 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_6 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) -optiondescription_9 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_9 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8, optiondescription_9]) diff --git a/tests/dictionaries/60extra_load/tiramisu/multi.py b/tests/dictionaries/60extra_load/tiramisu/multi.py index 639814d94..9c2e3c1f0 100644 --- a/tests/dictionaries/60extra_load/tiramisu/multi.py +++ b/tests/dictionaries/60extra_load/tiramisu/multi.py @@ -16,26 +16,31 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_6 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) -optiondescription_17 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_17 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16, optiondescription_17]) option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_10 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_8 = OptionDescription(name="general", doc="général", children=[option_9, option_10], properties=frozenset({"normal"})) -optiondescription_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8]) +optiondescription_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"normal"})) option_12 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_13 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_10, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_14 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_11 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_12, option_13, option_14], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11]) +optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11], properties=frozenset({"normal"})) optiondescription_18 = OptionDescription(name="2", doc="2", children=[optiondescription_19, optiondescription_20]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_18]) diff --git a/tests/dictionaries/60extra_mandatory/tiramisu/base.py b/tests/dictionaries/60extra_mandatory/tiramisu/base.py index 77607c07c..d174cd3b4 100644 --- a/tests/dictionaries/60extra_mandatory/tiramisu/base.py +++ b/tests/dictionaries/60extra_mandatory/tiramisu/base.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_9 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_6 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) option_8 = StrOption(name="var1", doc="var1", properties=frozenset({"basic", "mandatory"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5, option_6, option_7, option_8], properties=frozenset({"basic"})) -optiondescription_10 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_10 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9, optiondescription_10]) diff --git a/tests/dictionaries/60extra_mandatory/tiramisu/multi.py b/tests/dictionaries/60extra_mandatory/tiramisu/multi.py index 78d849aaf..b9aa4c422 100644 --- a/tests/dictionaries/60extra_mandatory/tiramisu/multi.py +++ b/tests/dictionaries/60extra_mandatory/tiramisu/multi.py @@ -16,28 +16,33 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_6 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) option_8 = StrOption(name="var1", doc="var1", properties=frozenset({"basic", "mandatory"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5, option_6, option_7, option_8], properties=frozenset({"basic"})) -optiondescription_19 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_19 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"basic"})) optiondescription_17 = OptionDescription(name="1", doc="1", children=[optiondescription_18, optiondescription_19]) option_10 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_11 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_9 = OptionDescription(name="general", doc="général", children=[option_10, option_11], properties=frozenset({"normal"})) -optiondescription_21 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_9]) +optiondescription_21 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_9], properties=frozenset({"normal"})) option_13 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_14 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_11, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_15 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) option_16 = StrOption(name="var1", doc="var1", properties=frozenset({"basic", "mandatory"})) optiondescription_12 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_13, option_14, option_15, option_16], properties=frozenset({"basic"})) -optiondescription_22 = OptionDescription(name="extra", doc="extra", children=[optiondescription_12]) +optiondescription_22 = OptionDescription(name="extra", doc="extra", children=[optiondescription_12], properties=frozenset({"basic"})) optiondescription_20 = OptionDescription(name="2", doc="2", children=[optiondescription_21, optiondescription_22]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_17, optiondescription_20]) diff --git a/tests/dictionaries/60extra_name_family/tiramisu/base.py b/tests/dictionaries/60extra_name_family/tiramisu/base.py index d50cfa975..d15c5d46a 100644 --- a/tests/dictionaries/60extra_name_family/tiramisu/base.py +++ b/tests/dictionaries/60extra_name_family/tiramisu/base.py @@ -16,15 +16,20 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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="extra", doc="extra", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_6 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) -optiondescription_9 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_9 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8, optiondescription_9]) diff --git a/tests/dictionaries/60extra_name_family/tiramisu/multi.py b/tests/dictionaries/60extra_name_family/tiramisu/multi.py index d8728875a..a746df2ff 100644 --- a/tests/dictionaries/60extra_name_family/tiramisu/multi.py +++ b/tests/dictionaries/60extra_name_family/tiramisu/multi.py @@ -16,26 +16,31 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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="extra", doc="extra", children=[option_2, option_3], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_6 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) -optiondescription_17 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_17 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16, optiondescription_17]) option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_10 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_8 = OptionDescription(name="extra", doc="extra", children=[option_9, option_10], properties=frozenset({"normal"})) -optiondescription_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8]) +optiondescription_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"normal"})) option_12 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_13 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_10, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_14 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_11 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_12, option_13, option_14], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11]) +optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11], properties=frozenset({"normal"})) optiondescription_18 = OptionDescription(name="2", doc="2", children=[optiondescription_19, optiondescription_20]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_18]) diff --git a/tests/dictionaries/60extra_no_condition/tiramisu/base.py b/tests/dictionaries/60extra_no_condition/tiramisu/base.py index a209c3403..ce9a8c0ad 100644 --- a/tests/dictionaries/60extra_no_condition/tiramisu/base.py +++ b/tests/dictionaries/60extra_no_condition/tiramisu/base.py @@ -16,16 +16,21 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_4 = StrOption(name="module_instancie", 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, option_4], properties=frozenset({"normal"})) -optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_6 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default="none", properties=frozenset({"mandatory", "normal"})) option_8 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="extra", doc="extra", children=[optiondescription_5]) +optiondescription_10 = OptionDescription(name="extra", doc="extra", children=[optiondescription_5], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9, optiondescription_10]) diff --git a/tests/dictionaries/60extra_no_condition/tiramisu/multi.py b/tests/dictionaries/60extra_no_condition/tiramisu/multi.py index 34b8a1fc0..3de901b74 100644 --- a/tests/dictionaries/60extra_no_condition/tiramisu/multi.py +++ b/tests/dictionaries/60extra_no_condition/tiramisu/multi.py @@ -16,28 +16,33 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_4 = StrOption(name="module_instancie", 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, option_4], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_6 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default="none", properties=frozenset({"mandatory", "normal"})) option_8 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) -optiondescription_19 = OptionDescription(name="extra", doc="extra", children=[optiondescription_5]) +optiondescription_19 = OptionDescription(name="extra", doc="extra", children=[optiondescription_5], properties=frozenset({"normal"})) optiondescription_17 = OptionDescription(name="1", doc="1", children=[optiondescription_18, optiondescription_19]) option_10 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_11 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_12 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_9 = OptionDescription(name="general", doc="général", children=[option_10, option_11, option_12], properties=frozenset({"normal"})) -optiondescription_21 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_9]) +optiondescription_21 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_9], properties=frozenset({"normal"})) option_14 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"mandatory", "normal"})) option_15 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default="none", properties=frozenset({"mandatory", "normal"})) option_16 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_13 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_14, option_15, option_16], properties=frozenset({"normal"})) -optiondescription_22 = OptionDescription(name="extra", doc="extra", children=[optiondescription_13]) +optiondescription_22 = OptionDescription(name="extra", doc="extra", children=[optiondescription_13], properties=frozenset({"normal"})) optiondescription_20 = OptionDescription(name="2", doc="2", children=[optiondescription_21, optiondescription_22]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_17, optiondescription_20]) diff --git a/tests/dictionaries/60extra_redefine/tiramisu/base.py b/tests/dictionaries/60extra_redefine/tiramisu/base.py index ad29d0034..5a1d51a5f 100644 --- a/tests/dictionaries/60extra_redefine/tiramisu/base.py +++ b/tests/dictionaries/60extra_redefine/tiramisu/base.py @@ -16,15 +16,20 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_6 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) -optiondescription_9 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_9 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_8, optiondescription_9]) diff --git a/tests/dictionaries/60extra_redefine/tiramisu/multi.py b/tests/dictionaries/60extra_redefine/tiramisu/multi.py index 052af788b..ded1bb448 100644 --- a/tests/dictionaries/60extra_redefine/tiramisu/multi.py +++ b/tests/dictionaries/60extra_redefine/tiramisu/multi.py @@ -16,26 +16,31 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_6 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_3, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_7 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_4 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_5, option_6, option_7], properties=frozenset({"normal"})) -optiondescription_17 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4]) +optiondescription_17 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"normal"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16, optiondescription_17]) option_9 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_10 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_8 = OptionDescription(name="general", doc="général", children=[option_9, option_10], properties=frozenset({"normal"})) -optiondescription_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8]) +optiondescription_19 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"normal"})) option_12 = StrOption(name="description", doc="description", default="Exportation de la base de ejabberd", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_13 = ChoiceOption(name="day", doc="day", values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_10, notraisepropertyerror=True), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({"mandatory", "normal"})) option_14 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), default="pre", properties=frozenset({"mandatory", "normal"})) optiondescription_11 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_12, option_13, option_14], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11]) +optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[optiondescription_11], properties=frozenset({"normal"})) optiondescription_18 = OptionDescription(name="2", doc="2", children=[optiondescription_19, optiondescription_20]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_15, optiondescription_18]) diff --git a/tests/dictionaries/60extra_variable_name_extra/tiramisu/base.py b/tests/dictionaries/60extra_variable_name_extra/tiramisu/base.py index c41887438..220e255d8 100644 --- a/tests/dictionaries/60extra_variable_name_extra/tiramisu/base.py +++ b/tests/dictionaries/60extra_variable_name_extra/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_4 = StrOption(name="extra", doc="extra", properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="extra", doc="extra", children=[option_4]) +optiondescription_6 = OptionDescription(name="extra", doc="extra", children=[option_4], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5, optiondescription_6]) diff --git a/tests/dictionaries/60extra_variable_name_extra/tiramisu/multi.py b/tests/dictionaries/60extra_variable_name_extra/tiramisu/multi.py index bb885294a..a5e401882 100644 --- a/tests/dictionaries/60extra_variable_name_extra/tiramisu/multi.py +++ b/tests/dictionaries/60extra_variable_name_extra/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) 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_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_4 = StrOption(name="extra", doc="extra", properties=frozenset({"normal"})) -optiondescription_11 = OptionDescription(name="extra", doc="extra", children=[option_4]) +optiondescription_11 = OptionDescription(name="extra", doc="extra", children=[option_4], properties=frozenset({"normal"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10, optiondescription_11]) option_6 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_7 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_5 = OptionDescription(name="general", doc="général", children=[option_6, option_7], properties=frozenset({"normal"})) -optiondescription_13 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_13 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_8 = StrOption(name="extra", doc="extra", properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="extra", doc="extra", children=[option_8]) +optiondescription_14 = OptionDescription(name="extra", doc="extra", children=[option_8], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="2", doc="2", children=[optiondescription_13, optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9, optiondescription_12]) diff --git a/tests/dictionaries/60familyaction/tiramisu/base.py b/tests/dictionaries/60familyaction/tiramisu/base.py index 51b356b4d..9b1f044c9 100644 --- a/tests/dictionaries/60familyaction/tiramisu/base.py +++ b/tests/dictionaries/60familyaction/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_4 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="test", doc="test", children=[option_4], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3]) +optiondescription_6 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5, optiondescription_6]) diff --git a/tests/dictionaries/60familyaction/tiramisu/multi.py b/tests/dictionaries/60familyaction/tiramisu/multi.py index a2e3f1f44..c2d17cefc 100644 --- a/tests/dictionaries/60familyaction/tiramisu/multi.py +++ b/tests/dictionaries/60familyaction/tiramisu/multi.py @@ -16,20 +16,25 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_4 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="test", doc="test", children=[option_4], properties=frozenset({"normal"})) -optiondescription_11 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3]) +optiondescription_11 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3], properties=frozenset({"normal"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10, optiondescription_11]) 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="général", children=[option_6], properties=frozenset({"normal"})) -optiondescription_13 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_13 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_8 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"})) optiondescription_7 = OptionDescription(name="test", doc="test", children=[option_8], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="extra", doc="extra", children=[optiondescription_7]) +optiondescription_14 = OptionDescription(name="extra", doc="extra", children=[optiondescription_7], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="2", doc="2", children=[optiondescription_13, optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9, optiondescription_12]) diff --git a/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py b/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py index 336340cc4..2c480a80b 100644 --- a/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py +++ b/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_4 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"})) option_5 = IntOption(name="day", doc="day avant lancement", properties=frozenset({"basic", "mandatory"})) optiondescription_3 = OptionDescription(name="test", doc="test", children=[option_4, option_5], properties=frozenset({"basic"})) -optiondescription_7 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3]) +optiondescription_7 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_6, optiondescription_7]) diff --git a/tests/dictionaries/60familyaction_mandatory/tiramisu/multi.py b/tests/dictionaries/60familyaction_mandatory/tiramisu/multi.py index d7f3793a5..be8923e29 100644 --- a/tests/dictionaries/60familyaction_mandatory/tiramisu/multi.py +++ b/tests/dictionaries/60familyaction_mandatory/tiramisu/multi.py @@ -16,22 +16,27 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_4 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"})) option_5 = IntOption(name="day", doc="day avant lancement", properties=frozenset({"basic", "mandatory"})) optiondescription_3 = OptionDescription(name="test", doc="test", children=[option_4, option_5], properties=frozenset({"basic"})) -optiondescription_13 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3]) +optiondescription_13 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3], properties=frozenset({"basic"})) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12, optiondescription_13]) 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="général", children=[option_7], properties=frozenset({"normal"})) -optiondescription_15 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6]) +optiondescription_15 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) option_9 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"})) option_10 = IntOption(name="day", doc="day avant lancement", properties=frozenset({"basic", "mandatory"})) optiondescription_8 = OptionDescription(name="test", doc="test", children=[option_9, option_10], properties=frozenset({"basic"})) -optiondescription_16 = OptionDescription(name="extra", doc="extra", children=[optiondescription_8]) +optiondescription_16 = OptionDescription(name="extra", doc="extra", children=[optiondescription_8], properties=frozenset({"basic"})) optiondescription_14 = OptionDescription(name="2", doc="2", children=[optiondescription_15, optiondescription_16]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_14]) diff --git a/tests/dictionaries/61extra_auto_freeze/tiramisu/base.py b/tests/dictionaries/61extra_auto_freeze/tiramisu/base.py index 6f757528f..62305b888 100644 --- a/tests/dictionaries/61extra_auto_freeze/tiramisu/base.py +++ b/tests/dictionaries/61extra_auto_freeze/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = BoolOption(name="server_deployed", doc="No change", default=True, properties=frozenset({"mandatory", "normal"})) 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]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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]) +optiondescription_7 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"basic"})) 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 b0c1fc947..2e746e88d 100644 --- a/tests/dictionaries/61extra_auto_freeze/tiramisu/multi.py +++ b/tests/dictionaries/61extra_auto_freeze/tiramisu/multi.py @@ -16,22 +16,27 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = BoolOption(name="server_deployed", doc="No change", default=True, properties=frozenset({"mandatory", "normal"})) 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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) 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_13 = OptionDescription(name="extra", doc="extra", children=[optiondescription_4], properties=frozenset({"basic"})) optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondescription_12, optiondescription_13]) option_7 = BoolOption(name="server_deployed", doc="No change", default=True, properties=frozenset({"mandatory", "normal"})) 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]) +optiondescription_15 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_6], properties=frozenset({"normal"})) 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_16 = OptionDescription(name="extra", doc="extra", children=[optiondescription_9], properties=frozenset({"basic"})) optiondescription_14 = OptionDescription(name="2", doc="2", children=[optiondescription_15, optiondescription_16]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_11, optiondescription_14]) diff --git a/tests/dictionaries/61extra_dyn/tiramisu/base.py b/tests/dictionaries/61extra_dyn/tiramisu/base.py index b02f624a4..cc68f7b6e 100644 --- a/tests/dictionaries/61extra_dyn/tiramisu/base.py +++ b/tests/dictionaries/61extra_dyn/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") from rougail.tiramisu import ConvertDynOptionDescription option_2 = StrOption(name="varname", doc="No change", multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_4 = StrOption(name="mode", doc="mode", properties=frozenset({"normal"})) optiondescription_3 = ConvertDynOptionDescription(name="ejabberd", doc="ejabberd", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3]) +optiondescription_6 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_5, optiondescription_6]) diff --git a/tests/dictionaries/61extra_dyn/tiramisu/multi.py b/tests/dictionaries/61extra_dyn/tiramisu/multi.py index df8d0b873..5cdfe689a 100644 --- a/tests/dictionaries/61extra_dyn/tiramisu/multi.py +++ b/tests/dictionaries/61extra_dyn/tiramisu/multi.py @@ -16,21 +16,26 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") from rougail.tiramisu import ConvertDynOptionDescription option_2 = StrOption(name="varname", doc="No change", multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_4 = StrOption(name="mode", doc="mode", properties=frozenset({"normal"})) optiondescription_3 = ConvertDynOptionDescription(name="ejabberd", doc="ejabberd", suffixes=Calculation(func.calc_value, Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_4], properties=frozenset({"normal"})) -optiondescription_11 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3]) +optiondescription_11 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3], properties=frozenset({"normal"})) optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10, optiondescription_11]) option_6 = StrOption(name="varname", doc="No change", multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"})) optiondescription_5 = OptionDescription(name="general", doc="général", children=[option_6], properties=frozenset({"normal"})) -optiondescription_13 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_13 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_8 = StrOption(name="mode", doc="mode", properties=frozenset({"normal"})) optiondescription_7 = ConvertDynOptionDescription(name="ejabberd", doc="ejabberd", suffixes=Calculation(func.calc_value, Params((ParamOption(option_6, notraisepropertyerror=True)))), children=[option_8], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="extra", doc="extra", children=[optiondescription_7]) +optiondescription_14 = OptionDescription(name="extra", doc="extra", children=[optiondescription_7], properties=frozenset({"normal"})) optiondescription_12 = OptionDescription(name="2", doc="2", children=[optiondescription_13, optiondescription_14]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_9, optiondescription_12]) diff --git a/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py b/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py index 9cd066340..d8a0ce14c 100644 --- a/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py +++ b/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py @@ -16,15 +16,20 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") from rougail.tiramisu import ConvertDynOptionDescription option_2 = StrOption(name="varname", doc="No change", multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_4 = StrOption(name="varname", doc="No change", multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) option_6 = StrOption(name="mode", doc="mode", properties=frozenset({"normal"})) optiondescription_5 = ConvertDynOptionDescription(name="ejabberd", doc="ejabberd", suffixes=Calculation(func.calc_value, Params((ParamOption(option_4, notraisepropertyerror=True)))), children=[option_6], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3, optiondescription_5]) +optiondescription_8 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3, optiondescription_5], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_7, optiondescription_8]) diff --git a/tests/dictionaries/61extra_dyn_extra/tiramisu/multi.py b/tests/dictionaries/61extra_dyn_extra/tiramisu/multi.py index 443536c89..47c6750db 100644 --- a/tests/dictionaries/61extra_dyn_extra/tiramisu/multi.py +++ b/tests/dictionaries/61extra_dyn_extra/tiramisu/multi.py @@ -16,25 +16,30 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") from rougail.tiramisu import ConvertDynOptionDescription option_2 = StrOption(name="varname", doc="No change", multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_4 = StrOption(name="varname", doc="No change", multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) option_6 = StrOption(name="mode", doc="mode", properties=frozenset({"normal"})) optiondescription_5 = ConvertDynOptionDescription(name="ejabberd", doc="ejabberd", suffixes=Calculation(func.calc_value, Params((ParamOption(option_4, notraisepropertyerror=True)))), children=[option_6], properties=frozenset({"normal"})) -optiondescription_15 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3, optiondescription_5]) +optiondescription_15 = OptionDescription(name="extra", doc="extra", children=[optiondescription_3, optiondescription_5], properties=frozenset({"normal"})) optiondescription_13 = OptionDescription(name="1", doc="1", children=[optiondescription_14, optiondescription_15]) option_8 = StrOption(name="varname", doc="No change", multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"})) optiondescription_7 = OptionDescription(name="general", doc="général", children=[option_8], properties=frozenset({"normal"})) -optiondescription_17 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7]) +optiondescription_17 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7], properties=frozenset({"normal"})) option_10 = StrOption(name="varname", doc="No change", multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"})) optiondescription_9 = OptionDescription(name="general", doc="général", children=[option_10], properties=frozenset({"normal"})) option_12 = StrOption(name="mode", doc="mode", properties=frozenset({"normal"})) optiondescription_11 = ConvertDynOptionDescription(name="ejabberd", doc="ejabberd", suffixes=Calculation(func.calc_value, Params((ParamOption(option_10, notraisepropertyerror=True)))), children=[option_12], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="extra", doc="extra", children=[optiondescription_9, optiondescription_11]) +optiondescription_18 = OptionDescription(name="extra", doc="extra", children=[optiondescription_9, optiondescription_11], properties=frozenset({"normal"})) optiondescription_16 = OptionDescription(name="2", doc="2", children=[optiondescription_17, optiondescription_18]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_13, optiondescription_16]) diff --git a/tests/dictionaries/70container_files/tiramisu/base.py b/tests/dictionaries/70container_files/tiramisu/base.py index b8483a36c..910ef1107 100644 --- a/tests/dictionaries/70container_files/tiramisu/base.py +++ b/tests/dictionaries/70container_files/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_8 = StrOption(name="source", doc="source", default="mailname") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70container_files/tiramisu/multi.py b/tests/dictionaries/70container_files/tiramisu/multi.py index 03aa13293..46a948b9d 100644 --- a/tests/dictionaries/70container_files/tiramisu/multi.py +++ b/tests/dictionaries/70container_files/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_10 = StrOption(name="source", doc="source", default="mailname") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -38,7 +43,7 @@ optiondescription_29 = OptionDescription(name="services", doc="services", childr optiondescription_27 = OptionDescription(name="1", doc="1", children=[optiondescription_28, optiondescription_29]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_21 = StrOption(name="source", doc="source", default="mailname") option_19 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py index df21312af..07eddfd9e 100644 --- a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = FilenameOption(name="file_name", doc="file_name", multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi="/etc/mailname", properties=frozenset({"mandatory", "normal"})) option_2 = FilenameOption(name="file_name2", doc="file_name2", multi=True, default=['/etc/mailname3', '/etc/mailname4'], default_multi="/etc/mailname3", properties=frozenset({"mandatory", "normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="name", opt=option_1) option_8 = StrOption(name="source", doc="source", default="mailname") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70container_files_symlink_multi/tiramisu/multi.py b/tests/dictionaries/70container_files_symlink_multi/tiramisu/multi.py index 3228bc388..84f388138 100644 --- a/tests/dictionaries/70container_files_symlink_multi/tiramisu/multi.py +++ b/tests/dictionaries/70container_files_symlink_multi/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = FilenameOption(name="file_name", doc="file_name", multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi="/etc/mailname", properties=frozenset({"mandatory", "normal"})) option_2 = FilenameOption(name="file_name2", doc="file_name2", multi=True, default=['/etc/mailname3', '/etc/mailname4'], default_multi="/etc/mailname3", properties=frozenset({"mandatory", "normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_9 = SymLinkOption(name="name", opt=option_1) option_10 = StrOption(name="source", doc="source", default="mailname") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -39,7 +44,7 @@ optiondescription_29 = OptionDescription(name="services", doc="services", childr optiondescription_27 = OptionDescription(name="1", doc="1", children=[optiondescription_28, optiondescription_29]) option_3 = FilenameOption(name="file_name", doc="file_name", multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi="/etc/mailname", properties=frozenset({"mandatory", "normal"})) option_4 = FilenameOption(name="file_name2", doc="file_name2", multi=True, default=['/etc/mailname3', '/etc/mailname4'], default_multi="/etc/mailname3", properties=frozenset({"mandatory", "normal"})) -optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"normal"})) option_20 = SymLinkOption(name="name", opt=option_3) option_21 = StrOption(name="source", doc="source", default="mailname") option_19 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py index 3bdfc92df..349ab3e8f 100644 --- a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = FilenameOption(name="file_name", doc="file_name", multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi="/etc/mailname", properties=frozenset({"mandatory", "normal"})) option_2 = FilenameOption(name="file_name2", doc="file_name2", multi=True, default=['/etc/mailname3', '/etc/mailname4'], default_multi="/etc/mailname3", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="var", doc="var", multi=True, default=['mailname', 'mailname2'], default_multi="mailname", properties=frozenset({"mandatory", "normal"})) -optiondescription_17 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3]) +optiondescription_17 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3], properties=frozenset({"normal"})) option_8 = SymLinkOption(name="name", opt=option_1) option_9 = StrOption(name="source", doc="source", default="mailname") option_10 = SymLinkOption(name="variable", opt=option_3) diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/multi.py b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/multi.py index 121c48cef..f0cac734b 100644 --- a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/multi.py +++ b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/multi.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = FilenameOption(name="file_name", doc="file_name", multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi="/etc/mailname", properties=frozenset({"mandatory", "normal"})) option_2 = FilenameOption(name="file_name2", doc="file_name2", multi=True, default=['/etc/mailname3', '/etc/mailname4'], default_multi="/etc/mailname3", properties=frozenset({"mandatory", "normal"})) option_3 = StrOption(name="var", doc="var", multi=True, default=['mailname', 'mailname2'], default_multi="mailname", properties=frozenset({"mandatory", "normal"})) -optiondescription_34 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3]) +optiondescription_34 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2, option_3], properties=frozenset({"normal"})) option_11 = SymLinkOption(name="name", opt=option_1) option_12 = StrOption(name="source", doc="source", default="mailname") option_13 = SymLinkOption(name="variable", opt=option_3) @@ -43,7 +48,7 @@ optiondescription_33 = OptionDescription(name="1", doc="1", children=[optiondesc option_4 = FilenameOption(name="file_name", doc="file_name", multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi="/etc/mailname", properties=frozenset({"mandatory", "normal"})) option_5 = FilenameOption(name="file_name2", doc="file_name2", multi=True, default=['/etc/mailname3', '/etc/mailname4'], default_multi="/etc/mailname3", properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="var", doc="var", multi=True, default=['mailname', 'mailname2'], default_multi="mailname", properties=frozenset({"mandatory", "normal"})) -optiondescription_38 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, option_5, option_6]) +optiondescription_38 = OptionDescription(name="rougail", doc="Rougail", children=[option_4, option_5, option_6], properties=frozenset({"normal"})) option_24 = SymLinkOption(name="name", opt=option_4) option_25 = StrOption(name="source", doc="source", default="mailname") option_26 = SymLinkOption(name="variable", opt=option_6) diff --git a/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py index 6422f9b46..d15d60711 100644 --- a/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = FilenameOption(name="file_name", doc="file_name", default="/etc/mailname", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="var", doc="var", default="mailname", properties=frozenset({"mandatory", "normal"})) -optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_11 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="name", opt=option_1) option_8 = StrOption(name="source", doc="source", default="mailname") option_9 = SymLinkOption(name="variable", opt=option_2) diff --git a/tests/dictionaries/70container_files_symlink_variable/tiramisu/multi.py b/tests/dictionaries/70container_files_symlink_variable/tiramisu/multi.py index 72d39dbed..708902fb9 100644 --- a/tests/dictionaries/70container_files_symlink_variable/tiramisu/multi.py +++ b/tests/dictionaries/70container_files_symlink_variable/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = FilenameOption(name="file_name", doc="file_name", default="/etc/mailname", properties=frozenset({"mandatory", "normal"})) option_2 = StrOption(name="var", doc="var", default="mailname", properties=frozenset({"mandatory", "normal"})) -optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_9 = SymLinkOption(name="name", opt=option_1) option_10 = StrOption(name="source", doc="source", default="mailname") option_11 = SymLinkOption(name="variable", opt=option_2) @@ -35,7 +40,7 @@ optiondescription_23 = OptionDescription(name="services", doc="services", childr optiondescription_21 = OptionDescription(name="1", doc="1", children=[optiondescription_22, optiondescription_23]) option_3 = FilenameOption(name="file_name", doc="file_name", default="/etc/mailname", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="var", doc="var", default="mailname", properties=frozenset({"mandatory", "normal"})) -optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_26 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"normal"})) option_17 = SymLinkOption(name="name", opt=option_3) option_18 = StrOption(name="source", doc="source", default="mailname") option_19 = SymLinkOption(name="variable", opt=option_4) diff --git a/tests/dictionaries/70container_files_twice/tiramisu/base.py b/tests/dictionaries/70container_files_twice/tiramisu/base.py index adeefa632..a14b3baf1 100644 --- a/tests/dictionaries/70container_files_twice/tiramisu/base.py +++ b/tests/dictionaries/70container_files_twice/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_8 = StrOption(name="source", doc="source", default="mailname") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70container_files_twice/tiramisu/multi.py b/tests/dictionaries/70container_files_twice/tiramisu/multi.py index d151792ba..976bd315b 100644 --- a/tests/dictionaries/70container_files_twice/tiramisu/multi.py +++ b/tests/dictionaries/70container_files_twice/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_36 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_10 = StrOption(name="source", doc="source", default="mailname") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -42,7 +47,7 @@ optiondescription_37 = OptionDescription(name="services", doc="services", childr optiondescription_35 = OptionDescription(name="1", doc="1", children=[optiondescription_36, optiondescription_37]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_40 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_40 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_24 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_25 = StrOption(name="source", doc="source", default="mailname") option_23 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70container_filesmulti/tiramisu/base.py b/tests/dictionaries/70container_filesmulti/tiramisu/base.py index f1b27bc35..1ae0188ae 100644 --- a/tests/dictionaries/70container_filesmulti/tiramisu/base.py +++ b/tests/dictionaries/70container_filesmulti/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_8 = StrOption(name="source", doc="source", default="mailname") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70container_filesmulti/tiramisu/multi.py b/tests/dictionaries/70container_filesmulti/tiramisu/multi.py index adf338d0d..704e05c97 100644 --- a/tests/dictionaries/70container_filesmulti/tiramisu/multi.py +++ b/tests/dictionaries/70container_filesmulti/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_10 = StrOption(name="source", doc="source", default="mailname") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -38,7 +43,7 @@ optiondescription_29 = OptionDescription(name="services", doc="services", childr optiondescription_27 = OptionDescription(name="1", doc="1", children=[optiondescription_28, optiondescription_29]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_32 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_20 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_21 = StrOption(name="source", doc="source", default="mailname") option_19 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70container_filesredefine/tiramisu/base.py b/tests/dictionaries/70container_filesredefine/tiramisu/base.py index 40818995e..fea652256 100644 --- a/tests/dictionaries/70container_filesredefine/tiramisu/base.py +++ b/tests/dictionaries/70container_filesredefine/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_8 = StrOption(name="source", doc="source", default="mailname.new") option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70container_filesredefine/tiramisu/multi.py b/tests/dictionaries/70container_filesredefine/tiramisu/multi.py index d7744bc72..9c18a3511 100644 --- a/tests/dictionaries/70container_filesredefine/tiramisu/multi.py +++ b/tests/dictionaries/70container_filesredefine/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_10 = StrOption(name="source", doc="source", default="mailname.new") option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -34,7 +39,7 @@ optiondescription_21 = OptionDescription(name="services", doc="services", childr optiondescription_19 = OptionDescription(name="1", doc="1", children=[optiondescription_20, optiondescription_21]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_16 = FilenameOption(name="name", doc="name", default="/etc/mailname") option_17 = StrOption(name="source", doc="source", default="mailname.new") option_15 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70container_new/tiramisu/base.py b/tests/dictionaries/70container_new/tiramisu/base.py index 39b2e856b..29558a849 100644 --- a/tests/dictionaries/70container_new/tiramisu/base.py +++ b/tests/dictionaries/70container_new/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_3 = BoolOption(name="activate", doc="activate", default=True) option_4 = BoolOption(name="manage", doc="manage", default=True) optiondescription_7 = OptionDescription(name="test_service", doc="test.service", children=[option_3, option_4]) diff --git a/tests/dictionaries/70container_new/tiramisu/multi.py b/tests/dictionaries/70container_new/tiramisu/multi.py index 8cb8411ea..4a7e66806 100644 --- a/tests/dictionaries/70container_new/tiramisu/multi.py +++ b/tests/dictionaries/70container_new/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = BoolOption(name="activate", doc="activate", default=True) option_6 = BoolOption(name="manage", doc="manage", default=True) optiondescription_12 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_6]) @@ -29,7 +34,7 @@ optiondescription_11 = OptionDescription(name="services", doc="services", childr optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10, optiondescription_11]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_7 = BoolOption(name="activate", doc="activate", default=True) option_8 = BoolOption(name="manage", doc="manage", default=True) optiondescription_16 = OptionDescription(name="test_service", doc="test.service", children=[option_7, option_8]) diff --git a/tests/dictionaries/70container_newnocont/tiramisu/base.py b/tests/dictionaries/70container_newnocont/tiramisu/base.py index 4ffdc94be..e87100060 100644 --- a/tests/dictionaries/70container_newnocont/tiramisu/base.py +++ b/tests/dictionaries/70container_newnocont/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_3 = BoolOption(name="activate", doc="activate", default=True) option_4 = BoolOption(name="manage", doc="manage", default=True) optiondescription_7 = OptionDescription(name="test_service", doc="test.service", children=[option_3, option_4]) diff --git a/tests/dictionaries/70container_newnocont/tiramisu/multi.py b/tests/dictionaries/70container_newnocont/tiramisu/multi.py index 3bdc16a2f..77e89b2b6 100644 --- a/tests/dictionaries/70container_newnocont/tiramisu/multi.py +++ b/tests/dictionaries/70container_newnocont/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = BoolOption(name="activate", doc="activate", default=True) option_6 = BoolOption(name="manage", doc="manage", default=True) optiondescription_12 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_6]) @@ -29,7 +34,7 @@ optiondescription_11 = OptionDescription(name="services", doc="services", childr optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10, optiondescription_11]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_7 = BoolOption(name="activate", doc="activate", default=True) option_8 = BoolOption(name="manage", doc="manage", default=True) optiondescription_16 = OptionDescription(name="test_service", doc="test.service", children=[option_7, option_8]) diff --git a/tests/dictionaries/70container_newwithip/tiramisu/base.py b/tests/dictionaries/70container_newwithip/tiramisu/base.py index 8ff15e58b..e7f32bb63 100644 --- a/tests/dictionaries/70container_newwithip/tiramisu/base.py +++ b/tests/dictionaries/70container_newwithip/tiramisu/base.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_3 = IPOption(name="adresse_ip_test", doc="No change", allow_reserved=True, properties=frozenset({"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]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_4 = BoolOption(name="activate", doc="activate", default=True) option_5 = BoolOption(name="manage", doc="manage", default=True) optiondescription_8 = OptionDescription(name="test_service", doc="test.service", children=[option_4, option_5]) diff --git a/tests/dictionaries/70container_newwithip/tiramisu/multi.py b/tests/dictionaries/70container_newwithip/tiramisu/multi.py index bcbe4c1f8..49da4a887 100644 --- a/tests/dictionaries/70container_newwithip/tiramisu/multi.py +++ b/tests/dictionaries/70container_newwithip/tiramisu/multi.py @@ -16,12 +16,17 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_3 = IPOption(name="adresse_ip_test", doc="No change", allow_reserved=True, properties=frozenset({"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]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_7 = BoolOption(name="activate", doc="activate", default=True) option_8 = BoolOption(name="manage", doc="manage", default=True) optiondescription_14 = OptionDescription(name="test_service", doc="test.service", children=[option_7, option_8]) @@ -31,7 +36,7 @@ optiondescription_11 = OptionDescription(name="1", doc="1", children=[optiondesc option_5 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_6 = IPOption(name="adresse_ip_test", doc="No change", allow_reserved=True, properties=frozenset({"normal"})) optiondescription_4 = OptionDescription(name="general", doc="général", children=[option_5, option_6], properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_4], properties=frozenset({"normal"})) option_9 = BoolOption(name="activate", doc="activate", default=True) option_10 = BoolOption(name="manage", doc="manage", default=True) optiondescription_18 = OptionDescription(name="test_service", doc="test.service", children=[option_9, option_10]) diff --git a/tests/dictionaries/70container_save/tiramisu/base.py b/tests/dictionaries/70container_save/tiramisu/base.py index 949dc001c..6e7fb2a9a 100644 --- a/tests/dictionaries/70container_save/tiramisu/base.py +++ b/tests/dictionaries/70container_save/tiramisu/base.py @@ -16,9 +16,14 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_3 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_3]) diff --git a/tests/dictionaries/70container_save/tiramisu/multi.py b/tests/dictionaries/70container_save/tiramisu/multi.py index 7da40c47d..d18b42b59 100644 --- a/tests/dictionaries/70container_save/tiramisu/multi.py +++ b/tests/dictionaries/70container_save/tiramisu/multi.py @@ -16,14 +16,19 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="1", doc="1", children=[optiondescription_6]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) 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/70service_base/tiramisu/base.py b/tests/dictionaries/70service_base/tiramisu/base.py index e7576c6f3..7f58b9a29 100644 --- a/tests/dictionaries/70service_base/tiramisu/base.py +++ b/tests/dictionaries/70service_base/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_3 = BoolOption(name="activate", doc="activate", default=True) option_4 = BoolOption(name="manage", doc="manage", default=True) optiondescription_7 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_3, option_4]) diff --git a/tests/dictionaries/70service_base/tiramisu/multi.py b/tests/dictionaries/70service_base/tiramisu/multi.py index 9b8c55690..03e49fdc1 100644 --- a/tests/dictionaries/70service_base/tiramisu/multi.py +++ b/tests/dictionaries/70service_base/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = BoolOption(name="activate", doc="activate", default=True) option_6 = BoolOption(name="manage", doc="manage", default=True) optiondescription_12 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_5, option_6]) @@ -29,7 +34,7 @@ optiondescription_11 = OptionDescription(name="services", doc="services", childr optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10, optiondescription_11]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_7 = BoolOption(name="activate", doc="activate", default=True) option_8 = BoolOption(name="manage", doc="manage", default=True) optiondescription_16 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_7, option_8]) diff --git a/tests/dictionaries/70service_disabled/tiramisu/base.py b/tests/dictionaries/70service_disabled/tiramisu/base.py index 502356d2a..5ef9cd3ad 100644 --- a/tests/dictionaries/70service_disabled/tiramisu/base.py +++ b/tests/dictionaries/70service_disabled/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_2 = BoolOption(name="activate", doc="activate", default=False) option_3 = BoolOption(name="manage", doc="manage", default=True) optiondescription_6 = OptionDescription(name="test_service", doc="test.service", children=[option_2, option_3]) diff --git a/tests/dictionaries/70service_disabled/tiramisu/multi.py b/tests/dictionaries/70service_disabled/tiramisu/multi.py index 7dee6cd71..88e1b822e 100644 --- a/tests/dictionaries/70service_disabled/tiramisu/multi.py +++ b/tests/dictionaries/70service_disabled/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_3 = BoolOption(name="activate", doc="activate", default=False) option_4 = BoolOption(name="manage", doc="manage", default=True) optiondescription_10 = OptionDescription(name="test_service", doc="test.service", children=[option_3, option_4]) @@ -27,7 +32,7 @@ optiondescription_10.impl_set_information('type', "service") optiondescription_9 = OptionDescription(name="services", doc="services", children=[optiondescription_10], properties=frozenset({"hidden"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8, optiondescription_9]) option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) option_5 = BoolOption(name="activate", doc="activate", default=False) option_6 = BoolOption(name="manage", doc="manage", default=True) optiondescription_14 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_6]) diff --git a/tests/dictionaries/70service_disabled_undisable/tiramisu/base.py b/tests/dictionaries/70service_disabled_undisable/tiramisu/base.py index f30681cdb..c976887c5 100644 --- a/tests/dictionaries/70service_disabled_undisable/tiramisu/base.py +++ b/tests/dictionaries/70service_disabled_undisable/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_2 = BoolOption(name="activate", doc="activate", default=False) option_3 = BoolOption(name="manage", doc="manage", default=True) optiondescription_6 = OptionDescription(name="test_service", doc="test.service", children=[option_2, option_3]) diff --git a/tests/dictionaries/70service_disabled_undisable/tiramisu/multi.py b/tests/dictionaries/70service_disabled_undisable/tiramisu/multi.py index 380f6198f..429a5f054 100644 --- a/tests/dictionaries/70service_disabled_undisable/tiramisu/multi.py +++ b/tests/dictionaries/70service_disabled_undisable/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_3 = BoolOption(name="activate", doc="activate", default=False) option_4 = BoolOption(name="manage", doc="manage", default=True) optiondescription_10 = OptionDescription(name="test_service", doc="test.service", children=[option_3, option_4]) @@ -28,7 +33,7 @@ optiondescription_10.impl_set_information('type', "service") optiondescription_9 = OptionDescription(name="services", doc="services", children=[optiondescription_10], properties=frozenset({"hidden"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8, optiondescription_9]) option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) option_5 = BoolOption(name="activate", doc="activate", default=False) option_6 = BoolOption(name="manage", doc="manage", default=True) optiondescription_14 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_6]) diff --git a/tests/dictionaries/70service_engine/tiramisu/base.py b/tests/dictionaries/70service_engine/tiramisu/base.py index 5364c48c5..9cc323124 100644 --- a/tests/dictionaries/70service_engine/tiramisu/base.py +++ b/tests/dictionaries/70service_engine/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_3 = BoolOption(name="activate", doc="activate", default=True) option_4 = BoolOption(name="manage", doc="manage", default=True) optiondescription_7 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_3, option_4]) diff --git a/tests/dictionaries/70service_engine/tiramisu/multi.py b/tests/dictionaries/70service_engine/tiramisu/multi.py index 97faaf6a0..f7de7b12b 100644 --- a/tests/dictionaries/70service_engine/tiramisu/multi.py +++ b/tests/dictionaries/70service_engine/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = BoolOption(name="activate", doc="activate", default=True) option_6 = BoolOption(name="manage", doc="manage", default=True) optiondescription_12 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_5, option_6]) @@ -30,7 +35,7 @@ optiondescription_11 = OptionDescription(name="services", doc="services", childr optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10, optiondescription_11]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_7 = BoolOption(name="activate", doc="activate", default=True) option_8 = BoolOption(name="manage", doc="manage", default=True) optiondescription_16 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_7, option_8]) diff --git a/tests/dictionaries/70service_engine_dash/tiramisu/base.py b/tests/dictionaries/70service_engine_dash/tiramisu/base.py index 9d338cf59..bb1559ec1 100644 --- a/tests/dictionaries/70service_engine_dash/tiramisu/base.py +++ b/tests/dictionaries/70service_engine_dash/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_3 = BoolOption(name="activate", doc="activate", default=True) option_4 = BoolOption(name="manage", doc="manage", default=True) optiondescription_7 = OptionDescription(name="test_srv_service", doc="test-srv.service", children=[option_3, option_4]) diff --git a/tests/dictionaries/70service_engine_dash/tiramisu/multi.py b/tests/dictionaries/70service_engine_dash/tiramisu/multi.py index 5c5166fbf..19517edeb 100644 --- a/tests/dictionaries/70service_engine_dash/tiramisu/multi.py +++ b/tests/dictionaries/70service_engine_dash/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = BoolOption(name="activate", doc="activate", default=True) option_6 = BoolOption(name="manage", doc="manage", default=True) optiondescription_12 = OptionDescription(name="test_srv_service", doc="test-srv.service", children=[option_5, option_6]) @@ -30,7 +35,7 @@ optiondescription_11 = OptionDescription(name="services", doc="services", childr optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10, optiondescription_11]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_7 = BoolOption(name="activate", doc="activate", default=True) option_8 = BoolOption(name="manage", doc="manage", default=True) optiondescription_16 = OptionDescription(name="test_srv_service", doc="test-srv.service", children=[option_7, option_8]) diff --git a/tests/dictionaries/70service_mount/tiramisu/base.py b/tests/dictionaries/70service_mount/tiramisu/base.py index 2d2de8813..01f168eb2 100644 --- a/tests/dictionaries/70service_mount/tiramisu/base.py +++ b/tests/dictionaries/70service_mount/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_3 = BoolOption(name="activate", doc="activate", default=True) option_4 = BoolOption(name="manage", doc="manage", default=True) optiondescription_7 = OptionDescription(name="testsrv_mount", doc="testsrv.mount", children=[option_3, option_4]) diff --git a/tests/dictionaries/70service_mount/tiramisu/multi.py b/tests/dictionaries/70service_mount/tiramisu/multi.py index e0da72ede..d396d112f 100644 --- a/tests/dictionaries/70service_mount/tiramisu/multi.py +++ b/tests/dictionaries/70service_mount/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = BoolOption(name="activate", doc="activate", default=True) option_6 = BoolOption(name="manage", doc="manage", default=True) optiondescription_12 = OptionDescription(name="testsrv_mount", doc="testsrv.mount", children=[option_5, option_6]) @@ -30,7 +35,7 @@ optiondescription_11 = OptionDescription(name="services", doc="services", childr optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10, optiondescription_11]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_7 = BoolOption(name="activate", doc="activate", default=True) option_8 = BoolOption(name="manage", doc="manage", default=True) optiondescription_16 = OptionDescription(name="testsrv_mount", doc="testsrv.mount", children=[option_7, option_8]) diff --git a/tests/dictionaries/70service_not_managed/tiramisu/base.py b/tests/dictionaries/70service_not_managed/tiramisu/base.py index 1578a3474..263cffdb3 100644 --- a/tests/dictionaries/70service_not_managed/tiramisu/base.py +++ b/tests/dictionaries/70service_not_managed/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="var", doc="var", default="mailname", properties=frozenset({"mandatory", "normal"})) -optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_6 = FilenameOption(name="name", doc="name", default="/tmp/test") option_7 = StrOption(name="source", doc="source", default="test") option_5 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70service_not_managed/tiramisu/multi.py b/tests/dictionaries/70service_not_managed/tiramisu/multi.py index eb3f2e896..cd4b74832 100644 --- a/tests/dictionaries/70service_not_managed/tiramisu/multi.py +++ b/tests/dictionaries/70service_not_managed/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="var", doc="var", default="mailname", properties=frozenset({"mandatory", "normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/tmp/test") option_8 = StrOption(name="source", doc="source", default="test") option_6 = BoolOption(name="activate", doc="activate", default=True) @@ -32,7 +37,7 @@ optiondescription_20.impl_set_information('type', "none") 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_2 = StrOption(name="var", doc="var", default="mailname", properties=frozenset({"mandatory", "normal"})) -optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) option_14 = FilenameOption(name="name", doc="name", default="/tmp/test") option_15 = StrOption(name="source", doc="source", default="test") option_13 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70service_servicelist/tiramisu/base.py b/tests/dictionaries/70service_servicelist/tiramisu/base.py index 1f76a5c96..93b4a47f9 100644 --- a/tests/dictionaries/70service_servicelist/tiramisu/base.py +++ b/tests/dictionaries/70service_servicelist/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_2 = 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")}))) option_3 = BoolOption(name="manage", doc="manage", default=True) optiondescription_6 = OptionDescription(name="test_service", doc="test.service", children=[option_2, option_3]) diff --git a/tests/dictionaries/70service_servicelist/tiramisu/multi.py b/tests/dictionaries/70service_servicelist/tiramisu/multi.py index ed89cb42d..9a7b381f3 100644 --- a/tests/dictionaries/70service_servicelist/tiramisu/multi.py +++ b/tests/dictionaries/70service_servicelist/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_3 = 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")}))) option_4 = BoolOption(name="manage", doc="manage", default=True) optiondescription_10 = OptionDescription(name="test_service", doc="test.service", children=[option_3, option_4]) @@ -27,7 +32,7 @@ optiondescription_10.impl_set_information('type', "service") optiondescription_9 = OptionDescription(name="services", doc="services", children=[optiondescription_10], properties=frozenset({"hidden"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8, optiondescription_9]) option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) 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) optiondescription_14 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_6]) 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 f1983e6d2..a495bac41 100644 --- a/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/base.py +++ b/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) 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) optiondescription_7 = OptionDescription(name="test_service", doc="test.service", children=[option_3, option_4]) 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 9545c026f..43a597ace 100644 --- a/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/multi.py +++ b/tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) 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) optiondescription_12 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_6]) @@ -29,7 +34,7 @@ optiondescription_11 = OptionDescription(name="services", doc="services", childr 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, notraisepropertyerror=True), 'expected': ParamValue("no")}), func.calc_value_property_help)})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"normal"})) 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) optiondescription_16 = OptionDescription(name="test_service", doc="test.service", children=[option_7, option_8]) diff --git a/tests/dictionaries/70service_servicelist_extra/tiramisu/base.py b/tests/dictionaries/70service_servicelist_extra/tiramisu/base.py index 901f0bce4..1ee5b9d48 100644 --- a/tests/dictionaries/70service_servicelist_extra/tiramisu/base.py +++ b/tests/dictionaries/70service_servicelist_extra/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_4 = OptionDescription(name="extra", doc="extra", children=[option_1]) +optiondescription_4 = OptionDescription(name="extra", doc="extra", children=[option_1], properties=frozenset({"normal"})) option_2 = 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")}))) option_3 = BoolOption(name="manage", doc="manage", default=True) optiondescription_6 = OptionDescription(name="test_service", doc="test.service", children=[option_2, option_3]) diff --git a/tests/dictionaries/70service_servicelist_extra/tiramisu/multi.py b/tests/dictionaries/70service_servicelist_extra/tiramisu/multi.py index 7520f2113..f4dd7b356 100644 --- a/tests/dictionaries/70service_servicelist_extra/tiramisu/multi.py +++ b/tests/dictionaries/70service_servicelist_extra/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_8 = OptionDescription(name="extra", doc="extra", children=[option_1]) +optiondescription_8 = OptionDescription(name="extra", doc="extra", children=[option_1], properties=frozenset({"normal"})) option_3 = 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")}))) option_4 = BoolOption(name="manage", doc="manage", default=True) optiondescription_10 = OptionDescription(name="test_service", doc="test.service", children=[option_3, option_4]) @@ -27,7 +32,7 @@ optiondescription_10.impl_set_information('type', "service") optiondescription_9 = OptionDescription(name="services", doc="services", children=[optiondescription_10], properties=frozenset({"hidden"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8, optiondescription_9]) option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_12 = OptionDescription(name="extra", doc="extra", children=[option_2]) +optiondescription_12 = OptionDescription(name="extra", doc="extra", children=[option_2], properties=frozenset({"normal"})) 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) optiondescription_14 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_6]) diff --git a/tests/dictionaries/70service_servicelist_file/tiramisu/base.py b/tests/dictionaries/70service_servicelist_file/tiramisu/base.py index cebe79866..12cf800c4 100644 --- a/tests/dictionaries/70service_servicelist_file/tiramisu/base.py +++ b/tests/dictionaries/70service_servicelist_file/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_7 = FilenameOption(name="name", doc="name", default="/etc/file") option_8 = StrOption(name="source", doc="source", default="file") 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("no")}))) diff --git a/tests/dictionaries/70service_servicelist_file/tiramisu/multi.py b/tests/dictionaries/70service_servicelist_file/tiramisu/multi.py index f3773db2e..1825abe0c 100644 --- a/tests/dictionaries/70service_servicelist_file/tiramisu/multi.py +++ b/tests/dictionaries/70service_servicelist_file/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_9 = FilenameOption(name="name", doc="name", default="/etc/file") option_10 = StrOption(name="source", doc="source", default="file") 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("no")}))) @@ -34,7 +39,7 @@ optiondescription_21 = OptionDescription(name="services", doc="services", childr optiondescription_19 = OptionDescription(name="1", doc="1", children=[optiondescription_20, optiondescription_21]) option_3 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) option_4 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"normal"})) option_16 = FilenameOption(name="name", doc="name", default="/etc/file") option_17 = StrOption(name="source", doc="source", default="file") option_15 = 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("no")}))) diff --git a/tests/dictionaries/70service_servicelist_ip/tiramisu/base.py b/tests/dictionaries/70service_servicelist_ip/tiramisu/base.py index ecea89b57..46c0b9795 100644 --- a/tests/dictionaries/70service_servicelist_ip/tiramisu/base.py +++ b/tests/dictionaries/70service_servicelist_ip/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="name", opt=option_2) option_6 = BoolOption(name="activate", doc="activate", default=True) optiondescription_5 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_6]) diff --git a/tests/dictionaries/70service_servicelist_ip/tiramisu/multi.py b/tests/dictionaries/70service_servicelist_ip/tiramisu/multi.py index b4b4cea33..a3c74cfaa 100644 --- a/tests/dictionaries/70service_servicelist_ip/tiramisu/multi.py +++ b/tests/dictionaries/70service_servicelist_ip/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_9 = SymLinkOption(name="name", opt=option_2) option_8 = BoolOption(name="activate", doc="activate", default=True) optiondescription_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_9, option_8]) @@ -33,7 +38,7 @@ optiondescription_19 = OptionDescription(name="services", doc="services", childr 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 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"normal"})) option_15 = SymLinkOption(name="name", opt=option_4) option_14 = BoolOption(name="activate", doc="activate", default=True) optiondescription_13 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_15, option_14]) diff --git a/tests/dictionaries/70service_servicelist_not_managed/tiramisu/base.py b/tests/dictionaries/70service_servicelist_not_managed/tiramisu/base.py index ebdee1394..1badb6202 100644 --- a/tests/dictionaries/70service_servicelist_not_managed/tiramisu/base.py +++ b/tests/dictionaries/70service_servicelist_not_managed/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_4 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_2 = 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")}))) option_3 = BoolOption(name="manage", doc="manage", default=False) optiondescription_6 = OptionDescription(name="test_service", doc="test.service", children=[option_2, option_3]) diff --git a/tests/dictionaries/70service_servicelist_not_managed/tiramisu/multi.py b/tests/dictionaries/70service_servicelist_not_managed/tiramisu/multi.py index 42d125f33..150881da9 100644 --- a/tests/dictionaries/70service_servicelist_not_managed/tiramisu/multi.py +++ b/tests/dictionaries/70service_servicelist_not_managed/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_3 = 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")}))) option_4 = BoolOption(name="manage", doc="manage", default=False) optiondescription_10 = OptionDescription(name="test_service", doc="test.service", children=[option_3, option_4]) @@ -27,7 +32,7 @@ optiondescription_10.impl_set_information('type', "none") optiondescription_9 = OptionDescription(name="services", doc="services", children=[optiondescription_10], properties=frozenset({"hidden"})) optiondescription_7 = OptionDescription(name="1", doc="1", children=[optiondescription_8, optiondescription_9]) option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) 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=False) optiondescription_14 = OptionDescription(name="test_service", doc="test.service", children=[option_5, option_6]) diff --git a/tests/dictionaries/70service_target/tiramisu/base.py b/tests/dictionaries/70service_target/tiramisu/base.py index 62c9701ba..77c992b83 100644 --- a/tests/dictionaries/70service_target/tiramisu/base.py +++ b/tests/dictionaries/70service_target/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_3 = BoolOption(name="activate", doc="activate", default=True) option_4 = BoolOption(name="manage", doc="manage", default=True) optiondescription_7 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_3, option_4]) diff --git a/tests/dictionaries/70service_target/tiramisu/multi.py b/tests/dictionaries/70service_target/tiramisu/multi.py index 6cdf4e564..a835e685e 100644 --- a/tests/dictionaries/70service_target/tiramisu/multi.py +++ b/tests/dictionaries/70service_target/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = BoolOption(name="activate", doc="activate", default=True) option_6 = BoolOption(name="manage", doc="manage", default=True) optiondescription_12 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_5, option_6]) @@ -30,7 +35,7 @@ optiondescription_11 = OptionDescription(name="services", doc="services", childr optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10, optiondescription_11]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_7 = BoolOption(name="activate", doc="activate", default=True) option_8 = BoolOption(name="manage", doc="manage", default=True) optiondescription_16 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_7, option_8]) diff --git a/tests/dictionaries/70service_target_engine/tiramisu/base.py b/tests/dictionaries/70service_target_engine/tiramisu/base.py index 9ff3300a1..5c126f588 100644 --- a/tests/dictionaries/70service_target_engine/tiramisu/base.py +++ b/tests/dictionaries/70service_target_engine/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_3 = BoolOption(name="activate", doc="activate", default=True) option_4 = BoolOption(name="manage", doc="manage", default=True) optiondescription_7 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_3, option_4]) diff --git a/tests/dictionaries/70service_target_engine/tiramisu/multi.py b/tests/dictionaries/70service_target_engine/tiramisu/multi.py index ca6c7a4fb..97b128ac4 100644 --- a/tests/dictionaries/70service_target_engine/tiramisu/multi.py +++ b/tests/dictionaries/70service_target_engine/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_2 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[option_2], properties=frozenset({"normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_5 = BoolOption(name="activate", doc="activate", default=True) option_6 = BoolOption(name="manage", doc="manage", default=True) optiondescription_12 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_5, option_6]) @@ -31,7 +36,7 @@ optiondescription_11 = OptionDescription(name="services", doc="services", childr optiondescription_9 = OptionDescription(name="1", doc="1", children=[optiondescription_10, optiondescription_11]) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) optiondescription_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"normal"})) -optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3]) +optiondescription_14 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"normal"})) option_7 = BoolOption(name="activate", doc="activate", default=True) option_8 = BoolOption(name="manage", doc="manage", default=True) optiondescription_16 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_7, option_8]) diff --git a/tests/dictionaries/70service_timer/tiramisu/base.py b/tests/dictionaries/70service_timer/tiramisu/base.py index a005b75af..6278ae996 100644 --- a/tests/dictionaries/70service_timer/tiramisu/base.py +++ b/tests/dictionaries/70service_timer/tiramisu/base.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = BoolOption(name="activate", doc="activate", default=True) option_2 = BoolOption(name="manage", doc="manage", default=True) optiondescription_6 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_1, option_2]) diff --git a/tests/dictionaries/70service_timer/tiramisu/multi.py b/tests/dictionaries/70service_timer/tiramisu/multi.py index 9b7d1e86a..334a44df9 100644 --- a/tests/dictionaries/70service_timer/tiramisu/multi.py +++ b/tests/dictionaries/70service_timer/tiramisu/multi.py @@ -16,8 +16,13 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = BoolOption(name="activate", doc="activate", default=True) option_2 = BoolOption(name="manage", doc="manage", default=True) optiondescription_11 = OptionDescription(name="testsrv_service", doc="testsrv.service", children=[option_1, option_2]) diff --git a/tests/dictionaries/70services_ip/tiramisu/base.py b/tests/dictionaries/70services_ip/tiramisu/base.py index fa095f4a8..877f179b3 100644 --- a/tests/dictionaries/70services_ip/tiramisu/base.py +++ b/tests/dictionaries/70services_ip/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_6 = SymLinkOption(name="name", opt=option_1) option_5 = BoolOption(name="activate", doc="activate", default=True) optiondescription_4 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_6, option_5]) diff --git a/tests/dictionaries/70services_ip/tiramisu/multi.py b/tests/dictionaries/70services_ip/tiramisu/multi.py index 738102c2c..4a34046e8 100644 --- a/tests/dictionaries/70services_ip/tiramisu/multi.py +++ b/tests/dictionaries/70services_ip/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="name", opt=option_1) option_6 = BoolOption(name="activate", doc="activate", default=True) optiondescription_5 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_6]) @@ -31,7 +36,7 @@ optiondescription_18.impl_set_information('type', "service") optiondescription_17 = OptionDescription(name="services", doc="services", children=[optiondescription_18], properties=frozenset({"hidden"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16, optiondescription_17]) option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) option_13 = SymLinkOption(name="name", opt=option_2) option_12 = BoolOption(name="activate", doc="activate", default=True) optiondescription_11 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_13, option_12]) diff --git a/tests/dictionaries/70services_ip_cidr/tiramisu/base.py b/tests/dictionaries/70services_ip_cidr/tiramisu/base.py index 4c3ce6ef9..517eb943b 100644 --- a/tests/dictionaries/70services_ip_cidr/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_cidr/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_6 = SymLinkOption(name="name", opt=option_1) option_5 = BoolOption(name="activate", doc="activate", default=True) optiondescription_4 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_6, option_5]) diff --git a/tests/dictionaries/70services_ip_cidr/tiramisu/multi.py b/tests/dictionaries/70services_ip_cidr/tiramisu/multi.py index fc797c3cf..31aa57b03 100644 --- a/tests/dictionaries/70services_ip_cidr/tiramisu/multi.py +++ b/tests/dictionaries/70services_ip_cidr/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="name", opt=option_1) option_6 = BoolOption(name="activate", doc="activate", default=True) optiondescription_5 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_6]) @@ -31,7 +36,7 @@ optiondescription_18.impl_set_information('type', "service") optiondescription_17 = OptionDescription(name="services", doc="services", children=[optiondescription_18], properties=frozenset({"hidden"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16, optiondescription_17]) option_2 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) option_13 = SymLinkOption(name="name", opt=option_2) option_12 = BoolOption(name="activate", doc="activate", default=True) optiondescription_11 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_13, option_12]) diff --git a/tests/dictionaries/70services_ip_disabled/tiramisu/base.py b/tests/dictionaries/70services_ip_disabled/tiramisu/base.py index 6205aea0d..f52a79cb6 100644 --- a/tests/dictionaries/70services_ip_disabled/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_disabled/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"disabled", "mandatory", "normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_6 = SymLinkOption(name="name", opt=option_1) option_5 = BoolOption(name="activate", doc="activate", default=True) optiondescription_4 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_6, option_5]) diff --git a/tests/dictionaries/70services_ip_disabled/tiramisu/multi.py b/tests/dictionaries/70services_ip_disabled/tiramisu/multi.py index 9a3e95cf7..114170e68 100644 --- a/tests/dictionaries/70services_ip_disabled/tiramisu/multi.py +++ b/tests/dictionaries/70services_ip_disabled/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"disabled", "mandatory", "normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="name", opt=option_1) option_6 = BoolOption(name="activate", doc="activate", default=True) optiondescription_5 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_6]) @@ -31,7 +36,7 @@ optiondescription_18.impl_set_information('type', "service") optiondescription_17 = OptionDescription(name="services", doc="services", children=[optiondescription_18], properties=frozenset({"hidden"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16, optiondescription_17]) option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"disabled", "mandatory", "normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) option_13 = SymLinkOption(name="name", opt=option_2) option_12 = BoolOption(name="activate", doc="activate", default=True) optiondescription_11 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_13, option_12]) diff --git a/tests/dictionaries/70services_ip_extra/tiramisu/base.py b/tests/dictionaries/70services_ip_extra/tiramisu/base.py index a2645362c..b26c681ae 100644 --- a/tests/dictionaries/70services_ip_extra/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_extra/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_8 = OptionDescription(name="extra", doc="extra", children=[option_1]) +optiondescription_8 = OptionDescription(name="extra", doc="extra", children=[option_1], properties=frozenset({"normal"})) option_6 = SymLinkOption(name="name", opt=option_1) option_5 = BoolOption(name="activate", doc="activate", default=True) optiondescription_4 = OptionDescription(name="extra_nut_monitor_host", doc="extra.nut_monitor_host", children=[option_6, option_5]) diff --git a/tests/dictionaries/70services_ip_extra/tiramisu/multi.py b/tests/dictionaries/70services_ip_extra/tiramisu/multi.py index ed34f299d..82e92061d 100644 --- a/tests/dictionaries/70services_ip_extra/tiramisu/multi.py +++ b/tests/dictionaries/70services_ip_extra/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_16 = OptionDescription(name="extra", doc="extra", children=[option_1]) +optiondescription_16 = OptionDescription(name="extra", doc="extra", children=[option_1], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="name", opt=option_1) option_6 = BoolOption(name="activate", doc="activate", default=True) optiondescription_5 = OptionDescription(name="extra_nut_monitor_host", doc="extra.nut_monitor_host", children=[option_7, option_6]) @@ -31,7 +36,7 @@ optiondescription_18.impl_set_information('type', "service") optiondescription_17 = OptionDescription(name="services", doc="services", children=[optiondescription_18], properties=frozenset({"hidden"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16, optiondescription_17]) option_2 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[option_2]) +optiondescription_20 = OptionDescription(name="extra", doc="extra", children=[option_2], properties=frozenset({"normal"})) option_13 = SymLinkOption(name="name", opt=option_2) option_12 = BoolOption(name="activate", doc="activate", default=True) optiondescription_11 = OptionDescription(name="extra_nut_monitor_host", doc="extra.nut_monitor_host", children=[option_13, option_12]) diff --git a/tests/dictionaries/70services_ip_iplist/tiramisu/base.py b/tests/dictionaries/70services_ip_iplist/tiramisu/base.py index 50518ad72..df394edcc 100644 --- a/tests/dictionaries/70services_ip_iplist/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_iplist/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help)})) -optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) 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")}))) optiondescription_5 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_6]) diff --git a/tests/dictionaries/70services_ip_iplist/tiramisu/multi.py b/tests/dictionaries/70services_ip_iplist/tiramisu/multi.py index c02eafde1..8d8fd195c 100644 --- a/tests/dictionaries/70services_ip_iplist/tiramisu/multi.py +++ b/tests/dictionaries/70services_ip_iplist/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") 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, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help)})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) 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")}))) optiondescription_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_9, option_8]) @@ -33,7 +38,7 @@ optiondescription_19 = OptionDescription(name="services", doc="services", childr 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, notraisepropertyerror=True), 'expected': ParamValue("yes")}), func.calc_value_property_help)})) -optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"normal"})) 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")}))) optiondescription_13 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_15, option_14]) diff --git a/tests/dictionaries/70services_ip_iplist2/tiramisu/base.py b/tests/dictionaries/70services_ip_iplist2/tiramisu/base.py index 02e37e3e5..b9de4653a 100644 --- a/tests/dictionaries/70services_ip_iplist2/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_iplist2/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="yes", 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"})) -optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_9 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) 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")}))) optiondescription_5 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_6]) diff --git a/tests/dictionaries/70services_ip_iplist2/tiramisu/multi.py b/tests/dictionaries/70services_ip_iplist2/tiramisu/multi.py index d5f1628c6..ae8eba29f 100644 --- a/tests/dictionaries/70services_ip_iplist2/tiramisu/multi.py +++ b/tests/dictionaries/70services_ip_iplist2/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = StrOption(name="condition", doc="condition", default="yes", 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"})) -optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_18 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) 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")}))) optiondescription_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_9, option_8]) @@ -33,7 +38,7 @@ optiondescription_19 = OptionDescription(name="services", doc="services", childr optiondescription_17 = OptionDescription(name="1", doc="1", children=[optiondescription_18, optiondescription_19]) option_3 = StrOption(name="condition", doc="condition", default="yes", 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"})) -optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_22 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"normal"})) 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")}))) optiondescription_13 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_15, option_14]) diff --git a/tests/dictionaries/70services_ip_leadership/tiramisu/base.py b/tests/dictionaries/70services_ip_leadership/tiramisu/base.py index b04c87cb4..a39ccbaff 100644 --- a/tests/dictionaries/70services_ip_leadership/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_leadership/tiramisu/base.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * -option_3 = NetmaskOption(name="nut_monitor_netmask", doc="nut_monitor_netmask", multi=True, default=['255.255.255.0'], properties=frozenset({"mandatory"})) + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +option_3 = NetmaskOption(name="nut_monitor_netmask", doc="nut_monitor_netmask", multi=True, default=['255.255.255.0'], properties=frozenset({"mandatory", "normal"})) option_4 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", multi=True, default_multi="192.168.1.0", properties=frozenset({"mandatory", "normal"})) optiondescription_2 = Leadership(name="nut_monitor_netmask", doc="nut_monitor_netmask", children=[option_3, option_4], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[optiondescription_2], properties=frozenset({"normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_9 = SymLinkOption(name="name", opt=option_4) option_10 = SymLinkOption(name="netmask", opt=option_3) option_8 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70services_ip_leadership/tiramisu/multi.py b/tests/dictionaries/70services_ip_leadership/tiramisu/multi.py index 546c9a6b1..f94efdc1d 100644 --- a/tests/dictionaries/70services_ip_leadership/tiramisu/multi.py +++ b/tests/dictionaries/70services_ip_leadership/tiramisu/multi.py @@ -16,13 +16,18 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * -option_3 = NetmaskOption(name="nut_monitor_netmask", doc="nut_monitor_netmask", multi=True, default=['255.255.255.0'], properties=frozenset({"mandatory"})) + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") +option_3 = NetmaskOption(name="nut_monitor_netmask", doc="nut_monitor_netmask", multi=True, default=['255.255.255.0'], properties=frozenset({"mandatory", "normal"})) option_4 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", multi=True, default_multi="192.168.1.0", properties=frozenset({"mandatory", "normal"})) optiondescription_2 = Leadership(name="nut_monitor_netmask", doc="nut_monitor_netmask", children=[option_3, option_4], properties=frozenset({"normal"})) optiondescription_1 = OptionDescription(name="general", doc="général", children=[optiondescription_2], properties=frozenset({"normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_1], properties=frozenset({"normal"})) option_13 = SymLinkOption(name="name", opt=option_4) option_14 = SymLinkOption(name="netmask", opt=option_3) option_12 = BoolOption(name="activate", doc="activate", default=True) @@ -34,11 +39,11 @@ optiondescription_26 = OptionDescription(name="ntp_service", doc="ntp.service", 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_7 = NetmaskOption(name="nut_monitor_netmask", doc="nut_monitor_netmask", multi=True, default=['255.255.255.0'], properties=frozenset({"mandatory"})) +option_7 = NetmaskOption(name="nut_monitor_netmask", doc="nut_monitor_netmask", multi=True, default=['255.255.255.0'], properties=frozenset({"mandatory", "normal"})) option_8 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", multi=True, default_multi="192.168.1.0", properties=frozenset({"mandatory", "normal"})) optiondescription_6 = Leadership(name="nut_monitor_netmask", doc="nut_monitor_netmask", children=[option_7, option_8], properties=frozenset({"normal"})) optiondescription_5 = OptionDescription(name="general", doc="général", children=[optiondescription_6], properties=frozenset({"normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_5], properties=frozenset({"normal"})) option_20 = SymLinkOption(name="name", opt=option_8) option_21 = SymLinkOption(name="netmask", opt=option_7) option_19 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70services_ip_multi/tiramisu/base.py b/tests/dictionaries/70services_ip_multi/tiramisu/base.py index 9679e7a39..9016bcd5d 100644 --- a/tests/dictionaries/70services_ip_multi/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_multi/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", multi=True, default=['192.168.0.1', '192.168.0.2'], default_multi="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_6 = SymLinkOption(name="name", opt=option_1) option_5 = BoolOption(name="activate", doc="activate", default=True) optiondescription_4 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_6, option_5]) diff --git a/tests/dictionaries/70services_ip_multi/tiramisu/multi.py b/tests/dictionaries/70services_ip_multi/tiramisu/multi.py index 9d41c23e4..0e08a1186 100644 --- a/tests/dictionaries/70services_ip_multi/tiramisu/multi.py +++ b/tests/dictionaries/70services_ip_multi/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", multi=True, default=['192.168.0.1', '192.168.0.2'], default_multi="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="name", opt=option_1) option_6 = BoolOption(name="activate", doc="activate", default=True) optiondescription_5 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_6]) @@ -31,7 +36,7 @@ optiondescription_18.impl_set_information('type', "service") optiondescription_17 = OptionDescription(name="services", doc="services", children=[optiondescription_18], properties=frozenset({"hidden"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16, optiondescription_17]) option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", multi=True, default=['192.168.0.1', '192.168.0.2'], default_multi="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) option_13 = SymLinkOption(name="name", opt=option_2) option_12 = BoolOption(name="activate", doc="activate", default=True) optiondescription_11 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_13, option_12]) diff --git a/tests/dictionaries/70services_ip_network/tiramisu/base.py b/tests/dictionaries/70services_ip_network/tiramisu/base.py index acc488932..32c5edef8 100644 --- a/tests/dictionaries/70services_ip_network/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_network/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = NetmaskOption(name="nut_monitor_netmask", doc="nut_monitor_netmask", default="255.255.255.0", properties=frozenset({"mandatory", "normal"})) option_2 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0", properties=frozenset({"mandatory", "normal"})) -optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="name", opt=option_2) option_8 = SymLinkOption(name="netmask", opt=option_1) option_6 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70services_ip_network/tiramisu/multi.py b/tests/dictionaries/70services_ip_network/tiramisu/multi.py index 696f13292..f7e10d221 100644 --- a/tests/dictionaries/70services_ip_network/tiramisu/multi.py +++ b/tests/dictionaries/70services_ip_network/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = NetmaskOption(name="nut_monitor_netmask", doc="nut_monitor_netmask", default="255.255.255.0", properties=frozenset({"mandatory", "normal"})) option_2 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0", properties=frozenset({"mandatory", "normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_9 = SymLinkOption(name="name", opt=option_2) option_10 = SymLinkOption(name="netmask", opt=option_1) option_8 = BoolOption(name="activate", doc="activate", default=True) @@ -34,7 +39,7 @@ optiondescription_21 = OptionDescription(name="services", doc="services", childr optiondescription_19 = OptionDescription(name="1", doc="1", children=[optiondescription_20, optiondescription_21]) option_3 = NetmaskOption(name="nut_monitor_netmask", doc="nut_monitor_netmask", default="255.255.255.0", properties=frozenset({"mandatory", "normal"})) option_4 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0", properties=frozenset({"mandatory", "normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"normal"})) option_16 = SymLinkOption(name="name", opt=option_4) option_17 = SymLinkOption(name="netmask", opt=option_3) option_15 = BoolOption(name="activate", doc="activate", default=True) diff --git a/tests/dictionaries/70services_ip_not_mandatory/tiramisu/base.py b/tests/dictionaries/70services_ip_not_mandatory/tiramisu/base.py index a6714151e..415f3f218 100644 --- a/tests/dictionaries/70services_ip_not_mandatory/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_not_mandatory/tiramisu/base.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", allow_reserved=True, properties=frozenset({"normal"})) -optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_6 = SymLinkOption(name="name", opt=option_1) option_5 = BoolOption(name="activate", doc="activate", default=True) optiondescription_4 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_6, option_5]) diff --git a/tests/dictionaries/70services_ip_not_mandatory/tiramisu/multi.py b/tests/dictionaries/70services_ip_not_mandatory/tiramisu/multi.py index d114a2982..1bed78208 100644 --- a/tests/dictionaries/70services_ip_not_mandatory/tiramisu/multi.py +++ b/tests/dictionaries/70services_ip_not_mandatory/tiramisu/multi.py @@ -16,10 +16,15 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", allow_reserved=True, properties=frozenset({"normal"})) -optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[option_1]) +optiondescription_16 = OptionDescription(name="rougail", doc="Rougail", children=[option_1], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="name", opt=option_1) option_6 = BoolOption(name="activate", doc="activate", default=True) optiondescription_5 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_6]) @@ -31,7 +36,7 @@ optiondescription_18.impl_set_information('type', "service") optiondescription_17 = OptionDescription(name="services", doc="services", children=[optiondescription_18], properties=frozenset({"hidden"})) optiondescription_15 = OptionDescription(name="1", doc="1", children=[optiondescription_16, optiondescription_17]) option_2 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", allow_reserved=True, properties=frozenset({"normal"})) -optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_2]) +optiondescription_20 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"normal"})) option_13 = SymLinkOption(name="name", opt=option_2) option_12 = BoolOption(name="activate", doc="activate", default=True) optiondescription_11 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_13, option_12]) diff --git a/tests/dictionaries/70services_ip_twice/tiramisu/base.py b/tests/dictionaries/70services_ip_twice/tiramisu/base.py index c20a3864c..cc9c2ee34 100644 --- a/tests/dictionaries/70services_ip_twice/tiramisu/base.py +++ b/tests/dictionaries/70services_ip_twice/tiramisu/base.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) option_2 = IPOption(name="nut_monitor_host2", doc="nut_monitor_host2", default="192.168.0.2", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_12 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_7 = SymLinkOption(name="name", opt=option_1) option_6 = BoolOption(name="activate", doc="activate", default=True) optiondescription_5 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_7, option_6]) diff --git a/tests/dictionaries/70services_ip_twice/tiramisu/multi.py b/tests/dictionaries/70services_ip_twice/tiramisu/multi.py index 338fe8b38..f8dd72db7 100644 --- a/tests/dictionaries/70services_ip_twice/tiramisu/multi.py +++ b/tests/dictionaries/70services_ip_twice/tiramisu/multi.py @@ -16,11 +16,16 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') try: from tiramisu4 import * + from tiramisu4.setting import ALLOWED_LEADER_PROPERTIES except: from tiramisu import * + from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("normal") +ALLOWED_LEADER_PROPERTIES.add("expert") option_1 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) option_2 = IPOption(name="nut_monitor_host2", doc="nut_monitor_host2", default="192.168.0.2", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2]) +optiondescription_24 = OptionDescription(name="rougail", doc="Rougail", children=[option_1, option_2], properties=frozenset({"normal"})) option_9 = SymLinkOption(name="name", opt=option_1) option_8 = BoolOption(name="activate", doc="activate", default=True) optiondescription_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_9, option_8]) @@ -36,7 +41,7 @@ optiondescription_25 = OptionDescription(name="services", doc="services", childr optiondescription_23 = OptionDescription(name="1", doc="1", children=[optiondescription_24, optiondescription_25]) option_3 = IPOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.1", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) option_4 = IPOption(name="nut_monitor_host2", doc="nut_monitor_host2", default="192.168.0.2", allow_reserved=True, properties=frozenset({"mandatory", "normal"})) -optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4]) +optiondescription_28 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"normal"})) option_18 = SymLinkOption(name="name", opt=option_3) option_17 = BoolOption(name="activate", doc="activate", default=True) optiondescription_16 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_18, option_17]) diff --git a/tests/dictionaries/80base_file_mode_wrong_type/yml/00-base.yml b/tests/dictionaries/80base_file_mode_wrong_type/yml/00-base.yml index 6cf06f91e..aac15cc66 100644 --- a/tests/dictionaries/80base_file_mode_wrong_type/yml/00-base.yml +++ b/tests/dictionaries/80base_file_mode_wrong_type/yml/00-base.yml @@ -3,5 +3,5 @@ services: - service: - name: test file: - - mode: "wrong_mode" + - mode: wrong_mode text: /etc/file