diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py index 8dc98b7d4..ea6c1ed84 100644 --- a/src/rougail/objspace.py +++ b/src/rougail/objspace.py @@ -38,7 +38,7 @@ FORCE_REDEFINABLES = ('family', 'follower', 'service', 'disknod', 'variables') # RougailObjSpace's elements that shall be forced to the UnRedefinable type FORCE_UNREDEFINABLES = ('value',) # RougailObjSpace's elements that shall not be modify -UNREDEFINABLE = ('multi', 'type',) +UNREDEFINABLE = ('type',) # RougailObjSpace's elements that did not created automaticly FORCE_ELEMENTS = ('property_', 'information') # XML text are convert has name diff --git a/tests/dictionaries/51redefine_multi/errno_48 b/tests/dictionaries/51redefine_multi/errno_48 deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dictionaries/51redefine_multi/makedict/after.json b/tests/dictionaries/51redefine_multi/makedict/after.json new file mode 100644 index 000000000..cfec4b1fc --- /dev/null +++ b/tests/dictionaries/51redefine_multi/makedict/after.json @@ -0,0 +1,8 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": [ + "non" + ] + } +} diff --git a/tests/dictionaries/51redefine_multi/makedict/base.json b/tests/dictionaries/51redefine_multi/makedict/base.json new file mode 100644 index 000000000..feedadc62 --- /dev/null +++ b/tests/dictionaries/51redefine_multi/makedict/base.json @@ -0,0 +1,5 @@ +{ + "rougail.general.mode_conteneur_actif": [ + "non" + ] +} diff --git a/tests/dictionaries/51redefine_multi/makedict/before.json b/tests/dictionaries/51redefine_multi/makedict/before.json new file mode 100644 index 000000000..cfec4b1fc --- /dev/null +++ b/tests/dictionaries/51redefine_multi/makedict/before.json @@ -0,0 +1,8 @@ +{ + "rougail.general.mode_conteneur_actif": { + "owner": "default", + "value": [ + "non" + ] + } +} diff --git a/tests/dictionaries/51redefine_multi/tiramisu/base.py b/tests/dictionaries/51redefine_multi/tiramisu/base.py new file mode 100644 index 000000000..eb475bb67 --- /dev/null +++ b/tests/dictionaries/51redefine_multi/tiramisu/base.py @@ -0,0 +1,20 @@ +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 +_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 function in dir(_func): + if function.startswith('_'): + continue + setattr(func, function, getattr(_func, function)) +try: + from tiramisu3 import * +except: + from tiramisu import * +option_3 = 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"})) +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/test_1_flattener.py b/tests/test_1_flattener.py index ef8ab1b41..45ab01316 100644 --- a/tests/test_1_flattener.py +++ b/tests/test_1_flattener.py @@ -29,7 +29,7 @@ excludes = set([]) #excludes = set(['01base_file_utfchar']) test_ok -= excludes test_raise -= excludes -#test_ok = ['00load_autofreeze'] +#test_ok = ['70container_filesredefine'] #test_ok = [] #test_raise = ['80auto_autofreeze'] #test_raise = []