From 12acf2a3f43b0b76acc08e675887707ca1557ce5 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Fri, 19 Mar 2021 10:05:50 +0100 Subject: [PATCH] update tests --- .../01base_domainname/00-base.xml | 2 +- .../02fill_multi_calc_val/00-base.xml | 19 ++++++++++++ .../__init__.py | 0 .../02fill_multi_calc_val/makedict/after.json | 12 +++++++ .../02fill_multi_calc_val/makedict/base.json | 6 ++++ .../makedict/before.json | 12 +++++++ .../02fill_multi_calc_val/tiramisu/base.py | 17 ++++++++++ .../02fill_multi_calc_val_multi/00-base.xml | 20 ++++++++++++ .../__init__.py} | 0 .../makedict/after.json | 18 +++++++++++ .../makedict/base.json | 12 +++++++ .../makedict/before.json | 18 +++++++++++ .../tiramisu/base.py | 17 ++++++++++ .../10check_no_param/tiramisu/base.py | 2 +- .../10check_option/tiramisu/base.py | 2 +- .../10check_optional/tiramisu/base.py | 2 +- .../10check_valid_differ/tiramisu/base.py | 2 +- .../10check_valid_differ_add/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10check_valid_in_network/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10check_valid_ipnetmask/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../11valid_enum_function/00-base.xml | 20 ++++++++++++ .../11valid_enum_function/__init__.py | 0 .../11valid_enum_function/makedict/after.json | 6 ++++ .../11valid_enum_function/makedict/base.json | 3 ++ .../makedict/before.json | 6 ++++ .../11valid_enum_function/tiramisu/base.py | 17 ++++++++++ .../20family_dynamic/tiramisu/base.py | 2 +- .../20family_dynamic_calc/tiramisu/base.py | 2 +- .../20family_dynamic_calc2/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../20family_dynamic_number/tiramisu/base.py | 2 +- tests/dictionaries/40ifin_multi2/00-base.xml | 31 +++++++++++++++++++ tests/dictionaries/40ifin_multi2/__init__.py | 0 .../40ifin_multi2/makedict/after.json | 10 ++++++ .../40ifin_multi2/makedict/base.json | 4 +++ .../40ifin_multi2/makedict/before.json | 10 ++++++ .../40ifin_multi2/tiramisu/base.py | 20 ++++++++++++ .../00-base.xml | 4 +-- .../61extra_auto_freeze/__init__.py | 0 .../extra_dirs/extra/00-base.xml | 0 .../61extra_auto_freeze/makedict/after.json | 14 +++++++++ .../61extra_auto_freeze/makedict/base.json | 5 +++ .../61extra_auto_freeze/makedict/before.json | 14 +++++++++ .../61extra_auto_freeze/tiramisu/base.py | 21 +++++++++++++ .../dictionaries/61extra_dyn/tiramisu/base.py | 2 +- .../61extra_dyn_extra/tiramisu/base.py | 2 +- 50 files changed, 352 insertions(+), 22 deletions(-) create mode 100644 tests/dictionaries/02fill_multi_calc_val/00-base.xml rename tests/dictionaries/{80extra_auto_freeze => 02fill_multi_calc_val}/__init__.py (100%) create mode 100644 tests/dictionaries/02fill_multi_calc_val/makedict/after.json create mode 100644 tests/dictionaries/02fill_multi_calc_val/makedict/base.json create mode 100644 tests/dictionaries/02fill_multi_calc_val/makedict/before.json create mode 100644 tests/dictionaries/02fill_multi_calc_val/tiramisu/base.py create mode 100644 tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml rename tests/dictionaries/{80extra_auto_freeze/errno_49 => 02fill_multi_calc_val_multi/__init__.py} (100%) create mode 100644 tests/dictionaries/02fill_multi_calc_val_multi/makedict/after.json create mode 100644 tests/dictionaries/02fill_multi_calc_val_multi/makedict/base.json create mode 100644 tests/dictionaries/02fill_multi_calc_val_multi/makedict/before.json create mode 100644 tests/dictionaries/02fill_multi_calc_val_multi/tiramisu/base.py create mode 100644 tests/dictionaries/11valid_enum_function/00-base.xml create mode 100644 tests/dictionaries/11valid_enum_function/__init__.py create mode 100644 tests/dictionaries/11valid_enum_function/makedict/after.json create mode 100644 tests/dictionaries/11valid_enum_function/makedict/base.json create mode 100644 tests/dictionaries/11valid_enum_function/makedict/before.json create mode 100644 tests/dictionaries/11valid_enum_function/tiramisu/base.py create mode 100644 tests/dictionaries/40ifin_multi2/00-base.xml create mode 100644 tests/dictionaries/40ifin_multi2/__init__.py create mode 100644 tests/dictionaries/40ifin_multi2/makedict/after.json create mode 100644 tests/dictionaries/40ifin_multi2/makedict/base.json create mode 100644 tests/dictionaries/40ifin_multi2/makedict/before.json create mode 100644 tests/dictionaries/40ifin_multi2/tiramisu/base.py rename tests/dictionaries/{80extra_auto_freeze => 61extra_auto_freeze}/00-base.xml (70%) create mode 100644 tests/dictionaries/61extra_auto_freeze/__init__.py rename tests/dictionaries/{80extra_auto_freeze => 61extra_auto_freeze}/extra_dirs/extra/00-base.xml (100%) create mode 100644 tests/dictionaries/61extra_auto_freeze/makedict/after.json create mode 100644 tests/dictionaries/61extra_auto_freeze/makedict/base.json create mode 100644 tests/dictionaries/61extra_auto_freeze/makedict/before.json create mode 100644 tests/dictionaries/61extra_auto_freeze/tiramisu/base.py diff --git a/tests/dictionaries/01base_domainname/00-base.xml b/tests/dictionaries/01base_domainname/00-base.xml index 3e2a265d..343c76d1 100644 --- a/tests/dictionaries/01base_domainname/00-base.xml +++ b/tests/dictionaries/01base_domainname/00-base.xml @@ -2,7 +2,7 @@ - + my.domain.name diff --git a/tests/dictionaries/02fill_multi_calc_val/00-base.xml b/tests/dictionaries/02fill_multi_calc_val/00-base.xml new file mode 100644 index 00000000..f12a5cfe --- /dev/null +++ b/tests/dictionaries/02fill_multi_calc_val/00-base.xml @@ -0,0 +1,19 @@ + + + + + no + + + + + + + var1 + True + var2 + + + + diff --git a/tests/dictionaries/80extra_auto_freeze/__init__.py b/tests/dictionaries/02fill_multi_calc_val/__init__.py similarity index 100% rename from tests/dictionaries/80extra_auto_freeze/__init__.py rename to tests/dictionaries/02fill_multi_calc_val/__init__.py diff --git a/tests/dictionaries/02fill_multi_calc_val/makedict/after.json b/tests/dictionaries/02fill_multi_calc_val/makedict/after.json new file mode 100644 index 00000000..2b3a9e6f --- /dev/null +++ b/tests/dictionaries/02fill_multi_calc_val/makedict/after.json @@ -0,0 +1,12 @@ +{ + "rougail.var1": { + "owner": "default", + "value": "no" + }, + "rougail.var2": { + "owner": "default", + "value": [ + "no" + ] + } +} diff --git a/tests/dictionaries/02fill_multi_calc_val/makedict/base.json b/tests/dictionaries/02fill_multi_calc_val/makedict/base.json new file mode 100644 index 00000000..7bf9abe0 --- /dev/null +++ b/tests/dictionaries/02fill_multi_calc_val/makedict/base.json @@ -0,0 +1,6 @@ +{ + "rougail.var1": "no", + "rougail.var2": [ + "no" + ] +} diff --git a/tests/dictionaries/02fill_multi_calc_val/makedict/before.json b/tests/dictionaries/02fill_multi_calc_val/makedict/before.json new file mode 100644 index 00000000..2b3a9e6f --- /dev/null +++ b/tests/dictionaries/02fill_multi_calc_val/makedict/before.json @@ -0,0 +1,12 @@ +{ + "rougail.var1": { + "owner": "default", + "value": "no" + }, + "rougail.var2": { + "owner": "default", + "value": [ + "no" + ] + } +} diff --git a/tests/dictionaries/02fill_multi_calc_val/tiramisu/base.py b/tests/dictionaries/02fill_multi_calc_val/tiramisu/base.py new file mode 100644 index 00000000..db712d76 --- /dev/null +++ b/tests/dictionaries/02fill_multi_calc_val/tiramisu/base.py @@ -0,0 +1,17 @@ +from importlib.machinery import SourceFileLoader +from importlib.util import spec_from_loader, module_from_spec +loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py') +spec = spec_from_loader(loader.name, loader) +func = module_from_spec(spec) +loader.exec_module(func) +for key, value in dict(locals()).items(): + if key != ['SourceFileLoader', 'func']: + setattr(func, key, value) +try: + from tiramisu3 import * +except: + from tiramisu import * +option_2 = StrOption(name="var1", doc="var1", default="no", properties=frozenset({"mandatory", "normal"})) +option_3 = StrOption(name="var2", doc="var2", multi=True, default=Calculation(func.calc_value, Params((ParamOption(option_2)), kwargs={'multi': ParamValue(True)})), properties=frozenset({"normal"})) +option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3]) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml b/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml new file mode 100644 index 00000000..ac1e413d --- /dev/null +++ b/tests/dictionaries/02fill_multi_calc_val_multi/00-base.xml @@ -0,0 +1,20 @@ + + + + + no + yes + maybe + + + + + + + var1 + var2 + + + + diff --git a/tests/dictionaries/80extra_auto_freeze/errno_49 b/tests/dictionaries/02fill_multi_calc_val_multi/__init__.py similarity index 100% rename from tests/dictionaries/80extra_auto_freeze/errno_49 rename to tests/dictionaries/02fill_multi_calc_val_multi/__init__.py diff --git a/tests/dictionaries/02fill_multi_calc_val_multi/makedict/after.json b/tests/dictionaries/02fill_multi_calc_val_multi/makedict/after.json new file mode 100644 index 00000000..e0b9759c --- /dev/null +++ b/tests/dictionaries/02fill_multi_calc_val_multi/makedict/after.json @@ -0,0 +1,18 @@ +{ + "rougail.var1": { + "owner": "default", + "value": [ + "no", + "yes", + "maybe" + ] + }, + "rougail.var2": { + "owner": "default", + "value": [ + "no", + "yes", + "maybe" + ] + } +} diff --git a/tests/dictionaries/02fill_multi_calc_val_multi/makedict/base.json b/tests/dictionaries/02fill_multi_calc_val_multi/makedict/base.json new file mode 100644 index 00000000..6e46ffd3 --- /dev/null +++ b/tests/dictionaries/02fill_multi_calc_val_multi/makedict/base.json @@ -0,0 +1,12 @@ +{ + "rougail.var1": [ + "no", + "yes", + "maybe" + ], + "rougail.var2": [ + "no", + "yes", + "maybe" + ] +} diff --git a/tests/dictionaries/02fill_multi_calc_val_multi/makedict/before.json b/tests/dictionaries/02fill_multi_calc_val_multi/makedict/before.json new file mode 100644 index 00000000..e0b9759c --- /dev/null +++ b/tests/dictionaries/02fill_multi_calc_val_multi/makedict/before.json @@ -0,0 +1,18 @@ +{ + "rougail.var1": { + "owner": "default", + "value": [ + "no", + "yes", + "maybe" + ] + }, + "rougail.var2": { + "owner": "default", + "value": [ + "no", + "yes", + "maybe" + ] + } +} diff --git a/tests/dictionaries/02fill_multi_calc_val_multi/tiramisu/base.py b/tests/dictionaries/02fill_multi_calc_val_multi/tiramisu/base.py new file mode 100644 index 00000000..1f9559b1 --- /dev/null +++ b/tests/dictionaries/02fill_multi_calc_val_multi/tiramisu/base.py @@ -0,0 +1,17 @@ +from importlib.machinery import SourceFileLoader +from importlib.util import spec_from_loader, module_from_spec +loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py') +spec = spec_from_loader(loader.name, loader) +func = module_from_spec(spec) +loader.exec_module(func) +for key, value in dict(locals()).items(): + if key != ['SourceFileLoader', 'func']: + setattr(func, key, value) +try: + from tiramisu3 import * +except: + from tiramisu import * +option_2 = StrOption(name="var1", doc="var1", multi=True, default=['no', 'yes', 'maybe'], default_multi="no", properties=frozenset({"mandatory", "normal"})) +option_3 = StrOption(name="var2", doc="var2", multi=True, default=Calculation(func.calc_value, Params((ParamOption(option_2)))), properties=frozenset({"normal"})) +option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3]) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10check_no_param/tiramisu/base.py b/tests/dictionaries/10check_no_param/tiramisu/base.py index 7f9a91e7..f4d2cc56 100644 --- a/tests/dictionaries/10check_no_param/tiramisu/base.py +++ b/tests/dictionaries/10check_no_param/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) -option_4 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption())), warnings_only=False)], properties=frozenset({"normal"})) +option_4 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption(whole=False))), warnings_only=False)], properties=frozenset({"normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10check_option/tiramisu/base.py b/tests/dictionaries/10check_option/tiramisu/base.py index 0a98381e..d84c7409 100644 --- a/tests/dictionaries/10check_option/tiramisu/base.py +++ b/tests/dictionaries/10check_option/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_4 = IntOption(name="int2", doc="No change", default=100, properties=frozenset({"mandatory", "normal"})) -option_5 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={'mini': ParamValue(0), 'maxi': ParamOption(option_4)}), warnings_only=False)], properties=frozenset({"normal"})) +option_5 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption(whole=False)), kwargs={'mini': ParamValue(0), 'maxi': ParamOption(option_4)}), warnings_only=False)], properties=frozenset({"normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10check_optional/tiramisu/base.py b/tests/dictionaries/10check_optional/tiramisu/base.py index a57c0530..473dfcd5 100644 --- a/tests/dictionaries/10check_optional/tiramisu/base.py +++ b/tests/dictionaries/10check_optional/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"})) option_5 = IntOption(name="int2", doc="No change", properties=frozenset({"normal"})) -option_4 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5))), warnings_only=False)], properties=frozenset({"normal"})) +option_4 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_5))), warnings_only=False)], properties=frozenset({"normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10check_valid_differ/tiramisu/base.py b/tests/dictionaries/10check_valid_differ/tiramisu/base.py index 4adb6a71..4d5cb900 100644 --- a/tests/dictionaries/10check_valid_differ/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * 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="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py index 9b178bd4..990e977f 100644 --- a/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py @@ -14,7 +14,7 @@ except: option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) +option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_5))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py index 15666891..07b78f1b 100644 --- a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py @@ -14,7 +14,7 @@ except: option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) +option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="oui", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_5))), warnings_only=False)], properties=frozenset({"mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10check_valid_in_network/tiramisu/base.py b/tests/dictionaries/10check_valid_in_network/tiramisu/base.py index b52f3d18..cdcd205c 100644 --- a/tests/dictionaries/10check_valid_in_network/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_in_network/tiramisu/base.py @@ -14,7 +14,7 @@ except: option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_4 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) option_5 = NetmaskOption(name="adresse_netmask_eth0", doc="Masque de sous réseau de la carte", properties=frozenset({"basic", "mandatory"})) -option_6 = IPOption(name="adresse_ip", doc="IP", validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4), ParamOption(option_5))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) +option_6 = IPOption(name="adresse_ip", doc="IP", validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(whole=False), ParamOption(option_4), ParamOption(option_5))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6], properties=frozenset({"basic"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) 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 cbffa263..7a9f5198 100644 --- a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_4 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", cidr=True, properties=frozenset({"basic", "mandatory"})) -option_5 = IPOption(name="adresse_ip", doc="IP", validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) +option_5 = IPOption(name="adresse_ip", doc="IP", validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"basic"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py index 94fb4430..51c47409 100644 --- a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) option_4 = IPOption(name="adresse_ip_eth0", doc="Adresse IP de la carte", private_only=True, warnings_only=True, properties=frozenset({"basic", "mandatory"})) -option_5 = NetmaskOption(name="adresse_netmask_eth0", doc="Masque de sous réseau de la carte", validators=[Calculation(func.valid_ipnetmask, Params((ParamSelfOption(), ParamOption(option_4))), warnings_only=True)], properties=frozenset({"basic", "mandatory"})) +option_5 = 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_4))), warnings_only=True)], properties=frozenset({"basic", "mandatory"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"basic"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py index f7c85630..c2eb1b41 100644 --- a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py @@ -15,7 +15,7 @@ option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non" option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"})) option_6 = StrOption(name="leader", doc="leader", multi=True) option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"})) -option_8 = StrOption(name="follower2", doc="follower2", multi=submulti, default=Calculation(func.calc_val, Params((ParamOption(option_7)))), properties=frozenset({"normal"})) +option_8 = StrOption(name="follower2", doc="follower2", multi=submulti, default=[Calculation(func.calc_val, Params((ParamOption(option_7))))], properties=frozenset({"normal"})) option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) option_4 = OptionDescription(name="general1", doc="general1", children=[option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4]) diff --git a/tests/dictionaries/11valid_enum_function/00-base.xml b/tests/dictionaries/11valid_enum_function/00-base.xml new file mode 100644 index 00000000..81bbe2fa --- /dev/null +++ b/tests/dictionaries/11valid_enum_function/00-base.xml @@ -0,0 +1,20 @@ + + + + + + 9 + + + + + + trange + 0 + 10 + var + + + + diff --git a/tests/dictionaries/11valid_enum_function/__init__.py b/tests/dictionaries/11valid_enum_function/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/11valid_enum_function/makedict/after.json b/tests/dictionaries/11valid_enum_function/makedict/after.json new file mode 100644 index 00000000..49800b2a --- /dev/null +++ b/tests/dictionaries/11valid_enum_function/makedict/after.json @@ -0,0 +1,6 @@ +{ + "rougail.general.var": { + "owner": "default", + "value": 9 + } +} diff --git a/tests/dictionaries/11valid_enum_function/makedict/base.json b/tests/dictionaries/11valid_enum_function/makedict/base.json new file mode 100644 index 00000000..6eeb5601 --- /dev/null +++ b/tests/dictionaries/11valid_enum_function/makedict/base.json @@ -0,0 +1,3 @@ +{ + "rougail.general.var": 9 +} diff --git a/tests/dictionaries/11valid_enum_function/makedict/before.json b/tests/dictionaries/11valid_enum_function/makedict/before.json new file mode 100644 index 00000000..49800b2a --- /dev/null +++ b/tests/dictionaries/11valid_enum_function/makedict/before.json @@ -0,0 +1,6 @@ +{ + "rougail.general.var": { + "owner": "default", + "value": 9 + } +} diff --git a/tests/dictionaries/11valid_enum_function/tiramisu/base.py b/tests/dictionaries/11valid_enum_function/tiramisu/base.py new file mode 100644 index 00000000..c4f1545e --- /dev/null +++ b/tests/dictionaries/11valid_enum_function/tiramisu/base.py @@ -0,0 +1,17 @@ +from importlib.machinery import SourceFileLoader +from importlib.util import spec_from_loader, module_from_spec +loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py') +spec = spec_from_loader(loader.name, loader) +func = module_from_spec(spec) +loader.exec_module(func) +for key, value in dict(locals()).items(): + if key != ['SourceFileLoader', 'func']: + setattr(func, key, value) +try: + from tiramisu3 import * +except: + from tiramisu import * +option_3 = ChoiceOption(name="var", doc="New variable", values=Calculation(func.trange, Params((ParamValue(0), ParamValue(10)))), default=9, properties=frozenset({"mandatory", "normal"})) +option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"})) +option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic/tiramisu/base.py b/tests/dictionaries/20family_dynamic/tiramisu/base.py index 96ff3a94..732b3599 100644 --- a/tests/dictionaries/20family_dynamic/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"})) option_5 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) -option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"normal"})) +option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py index 8daf2096..f95a1bb2 100644 --- a/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"})) option_5 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal"})) -option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"normal"})) +option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"normal"})) option_7 = StrOption(name="newvar", doc="No change", default=Calculation(func.calc_val, Params((ParamDynOption(option_5, 'val1', option_4)))), properties=frozenset({"normal"})) option_6 = OptionDescription(name="new", doc="new", children=[option_7], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4, option_6]) diff --git a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py index 39b54a6b..d665934b 100644 --- a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py @@ -16,7 +16,7 @@ option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"})) option_7 = StrOption(name="newvar", doc="No change", properties=frozenset({"normal"})) option_5 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) +option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) option_6 = OptionDescription(name="new", doc="new", children=[option_7], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py index 25700e76..3bceab1b 100644 --- a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"})) option_5 = StrOption(name="vardyn", doc="No change", default=Calculation(func.calc_val, Params((ParamSuffix()))), properties=frozenset({"normal"})) -option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"normal"})) +option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"normal"})) option_7 = StrOption(name="newvar", doc="No change", properties=frozenset({"normal"})) option_6 = OptionDescription(name="new", doc="new", children=[option_7], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4, option_6]) diff --git a/tests/dictionaries/20family_dynamic_description/tiramisu/base.py b/tests/dictionaries/20family_dynamic_description/tiramisu/base.py index 27f284aa..43a78559 100644 --- a/tests/dictionaries/20family_dynamic_description/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_description/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", properties=frozenset({"mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"})) option_5 = StrOption(name="vardyn", doc="No change", properties=frozenset({"normal"})) -option_4 = ConvertDynOptionDescription(name="dyn", doc="Dyn ", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"normal"})) +option_4 = ConvertDynOptionDescription(name="dyn", doc="Dyn ", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic_number/tiramisu/base.py b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py index 75fad259..6f1ba49e 100644 --- a/tests/dictionaries/20family_dynamic_number/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = IntOption(name="varname", doc="No change", multi=True, default=[1, 2], default_multi=1, properties=frozenset({"mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"})) option_5 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal"})) -option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"normal"})) +option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"normal"})) option_7 = StrOption(name="newvar", doc="No change", default=Calculation(func.calc_val, Params((ParamDynOption(option_5, '1', option_4)))), properties=frozenset({"normal"})) option_6 = OptionDescription(name="new", doc="new", children=[option_7], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4, option_6]) diff --git a/tests/dictionaries/40ifin_multi2/00-base.xml b/tests/dictionaries/40ifin_multi2/00-base.xml new file mode 100644 index 00000000..498b2c08 --- /dev/null +++ b/tests/dictionaries/40ifin_multi2/00-base.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + oui + mode_conteneur_actif3 + + + oui + mode_conteneur_actif3 + + + + diff --git a/tests/dictionaries/40ifin_multi2/__init__.py b/tests/dictionaries/40ifin_multi2/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/40ifin_multi2/makedict/after.json b/tests/dictionaries/40ifin_multi2/makedict/after.json new file mode 100644 index 00000000..4efa6e2f --- /dev/null +++ b/tests/dictionaries/40ifin_multi2/makedict/after.json @@ -0,0 +1,10 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + }, + "rougail.general2.mode_conteneur_actif2": { + "owner": "default", + "value": "oui" + } +} diff --git a/tests/dictionaries/40ifin_multi2/makedict/base.json b/tests/dictionaries/40ifin_multi2/makedict/base.json new file mode 100644 index 00000000..ec1b5d8c --- /dev/null +++ b/tests/dictionaries/40ifin_multi2/makedict/base.json @@ -0,0 +1,4 @@ +{ + "rougail.general.mode_conteneur_actif": "non", + "rougail.general2.mode_conteneur_actif2": "oui" +} diff --git a/tests/dictionaries/40ifin_multi2/makedict/before.json b/tests/dictionaries/40ifin_multi2/makedict/before.json new file mode 100644 index 00000000..4efa6e2f --- /dev/null +++ b/tests/dictionaries/40ifin_multi2/makedict/before.json @@ -0,0 +1,10 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": "non" + }, + "rougail.general2.mode_conteneur_actif2": { + "owner": "default", + "value": "oui" + } +} diff --git a/tests/dictionaries/40ifin_multi2/tiramisu/base.py b/tests/dictionaries/40ifin_multi2/tiramisu/base.py new file mode 100644 index 00000000..1047e2c1 --- /dev/null +++ b/tests/dictionaries/40ifin_multi2/tiramisu/base.py @@ -0,0 +1,20 @@ +from importlib.machinery import SourceFileLoader +from importlib.util import spec_from_loader, module_from_spec +loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py') +spec = spec_from_loader(loader.name, loader) +func = module_from_spec(spec) +loader.exec_module(func) +for key, value in dict(locals()).items(): + if key != ['SourceFileLoader', 'func']: + setattr(func, key, value) +try: + from tiramisu3 import * +except: + from tiramisu import * +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) +option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="oui", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) +option_6 = 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_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))})) +option_4 = OptionDescription(name="general2", doc="general2", children=[option_5, option_6], properties=frozenset({"hidden", "normal"})) +option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4]) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/80extra_auto_freeze/00-base.xml b/tests/dictionaries/61extra_auto_freeze/00-base.xml similarity index 70% rename from tests/dictionaries/80extra_auto_freeze/00-base.xml rename to tests/dictionaries/61extra_auto_freeze/00-base.xml index fbfaa0c4..761ed99c 100644 --- a/tests/dictionaries/80extra_auto_freeze/00-base.xml +++ b/tests/dictionaries/61extra_auto_freeze/00-base.xml @@ -2,9 +2,7 @@ - - non - + diff --git a/tests/dictionaries/61extra_auto_freeze/__init__.py b/tests/dictionaries/61extra_auto_freeze/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/80extra_auto_freeze/extra_dirs/extra/00-base.xml b/tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/dictionaries/80extra_auto_freeze/extra_dirs/extra/00-base.xml rename to tests/dictionaries/61extra_auto_freeze/extra_dirs/extra/00-base.xml diff --git a/tests/dictionaries/61extra_auto_freeze/makedict/after.json b/tests/dictionaries/61extra_auto_freeze/makedict/after.json new file mode 100644 index 00000000..fbe17107 --- /dev/null +++ b/tests/dictionaries/61extra_auto_freeze/makedict/after.json @@ -0,0 +1,14 @@ +{ + "rougail.general.server_deployed": { + "owner": "default", + "value": true + }, + "rougail.general.activer_ejabberd": { + "owner": "default", + "value": "non" + }, + "extra.ejabberd.mode": { + "owner": "forced", + "value": "pre" + } +} diff --git a/tests/dictionaries/61extra_auto_freeze/makedict/base.json b/tests/dictionaries/61extra_auto_freeze/makedict/base.json new file mode 100644 index 00000000..42890f47 --- /dev/null +++ b/tests/dictionaries/61extra_auto_freeze/makedict/base.json @@ -0,0 +1,5 @@ +{ + "rougail.general.server_deployed": true, + "rougail.general.activer_ejabberd": "non", + "extra.ejabberd.mode": "pre" +} diff --git a/tests/dictionaries/61extra_auto_freeze/makedict/before.json b/tests/dictionaries/61extra_auto_freeze/makedict/before.json new file mode 100644 index 00000000..8f32cc77 --- /dev/null +++ b/tests/dictionaries/61extra_auto_freeze/makedict/before.json @@ -0,0 +1,14 @@ +{ + "rougail.general.server_deployed": { + "owner": "default", + "value": true + }, + "rougail.general.activer_ejabberd": { + "owner": "default", + "value": "non" + }, + "extra.ejabberd.mode": { + "owner": "default", + "value": "pre" + } +} diff --git a/tests/dictionaries/61extra_auto_freeze/tiramisu/base.py b/tests/dictionaries/61extra_auto_freeze/tiramisu/base.py new file mode 100644 index 00000000..e71f2178 --- /dev/null +++ b/tests/dictionaries/61extra_auto_freeze/tiramisu/base.py @@ -0,0 +1,21 @@ +from importlib.machinery import SourceFileLoader +from importlib.util import spec_from_loader, module_from_spec +loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py') +spec = spec_from_loader(loader.name, loader) +func = module_from_spec(spec) +loader.exec_module(func) +for key, value in dict(locals()).items(): + if key != ['SourceFileLoader', 'func']: + setattr(func, key, value) +try: + from tiramisu3 import * +except: + from tiramisu import * +option_3 = BoolOption(name="server_deployed", doc="No change", default=True, properties=frozenset({"mandatory", "normal"})) +option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) +option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"})) +option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) +option_7 = 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_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) +option_6 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_7], properties=frozenset({"basic"})) +option_5 = OptionDescription(name="extra", doc="extra", children=[option_6]) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5]) diff --git a/tests/dictionaries/61extra_dyn/tiramisu/base.py b/tests/dictionaries/61extra_dyn/tiramisu/base.py index 29dce486..82721798 100644 --- a/tests/dictionaries/61extra_dyn/tiramisu/base.py +++ b/tests/dictionaries/61extra_dyn/tiramisu/base.py @@ -16,6 +16,6 @@ option_3 = StrOption(name="varname", doc="No change", multi=True, default=['a'], option_2 = OptionDescription(name="general", doc="général", children=[option_3], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_6 = StrOption(name="mode", doc="mode", properties=frozenset({"normal"})) -option_5 = ConvertDynOptionDescription(name="ejabberd", doc="ejabberd", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_6], properties=frozenset({"normal"})) +option_5 = ConvertDynOptionDescription(name="ejabberd", doc="ejabberd", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_6], properties=frozenset({"normal"})) option_4 = OptionDescription(name="extra", doc="extra", children=[option_5]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) diff --git a/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py b/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py index f9ab1985..b5f31810 100644 --- a/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py +++ b/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py @@ -18,6 +18,6 @@ option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_6 = StrOption(name="varname", doc="No change", multi=True, default=['a'], default_multi="a", properties=frozenset({"mandatory", "normal"})) option_5 = OptionDescription(name="general", doc="général", children=[option_6], properties=frozenset({"normal"})) option_8 = StrOption(name="mode", doc="mode", properties=frozenset({"normal"})) -option_7 = ConvertDynOptionDescription(name="ejabberd", doc="ejabberd", suffixes=Calculation(func.calc_value, Params((ParamOption(option_6)))), children=[option_8], properties=frozenset({"normal"})) +option_7 = ConvertDynOptionDescription(name="ejabberd", doc="ejabberd", suffixes=Calculation(func.calc_value, Params((ParamOption(option_6, notraisepropertyerror=True)))), children=[option_8], properties=frozenset({"normal"})) option_4 = OptionDescription(name="extra", doc="extra", children=[option_5, option_7]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])