diff --git a/src/rougail/annotator/family.py b/src/rougail/annotator/family.py index da3c4421..45f4e1b9 100644 --- a/src/rougail/annotator/family.py +++ b/src/rougail/annotator/family.py @@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ from ..i18n import _ from ..error import DictConsistencyError -from ..utils import normalize_family from .variable import Walk @@ -91,7 +90,6 @@ class FamilyAnnotator(Walk): family.description = family.name family.doc = family.description del family.description - family.name = normalize_family(family.name) def change_modes(self): """change the mode of variables diff --git a/src/rougail/annotator/variable.py b/src/rougail/annotator/variable.py index 1cecf742..cc492605 100644 --- a/src/rougail/annotator/variable.py +++ b/src/rougail/annotator/variable.py @@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA from ..i18n import _ from ..error import DictConsistencyError from ..objspace import convert_boolean -from ..utils import normalize_family CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int), @@ -171,7 +170,6 @@ class VariableAnnotator(Walk): # pylint: disable=R0903 if not variable.value: del variable.value variable.doc = variable.description - variable.name = normalize_family(variable.name) del variable.description if variable_type == 'follower': if variable.multi is True: diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py index b7b2878f..191cf007 100644 --- a/src/rougail/objspace.py +++ b/src/rougail/objspace.py @@ -29,7 +29,7 @@ from typing import Optional from .i18n import _ from .xmlreflector import XMLReflector -from .utils import normalize_family +from .utils import valid_variable_family_name from .error import SpaceObjShallNotBeUpdated, DictConsistencyError from .path import Path @@ -197,7 +197,7 @@ class RougailObjSpace: if child.tag == 'family': if child.attrib['name'] in family_names: msg = _(f'Family "{child.attrib["name"]}" is set several times') - raise DictConsistencyError(msg, 44, xmlfile) + raise DictConsistencyError(msg, 44, [xmlfile]) family_names.append(child.attrib['name']) try: # variable objects creation @@ -296,6 +296,7 @@ class RougailObjSpace: """A redefinable object could be created or updated """ existed_var = self.get_existed_obj(name, + xmlfile, space, child, namespace, @@ -337,6 +338,7 @@ class RougailObjSpace: def get_existed_obj(self, name: str, + xmlfile: str, space: str, child, namespace: str, @@ -344,7 +346,7 @@ class RougailObjSpace: """if an object exists, return it """ if child.tag in ['variable', 'family']: - name = normalize_family(name) + valid_variable_family_name(name, [xmlfile]) if child.tag == 'variable': # pylint: disable=E1101 if namespace != self.rougailconfig['variable_namespace']: name = space.path + '.' + name @@ -468,18 +470,18 @@ class RougailObjSpace: """ if isinstance(variableobj, self.variable): # pylint: disable=E1101 if 'name' in document.attrib: - family_name = normalize_family(document.attrib['name']) + family_name = document.attrib['name'] else: family_name = namespace self.paths.add_variable(namespace, - normalize_family(variableobj.name), + variableobj.name, space.path, document.attrib.get('dynamic') is not None, variableobj, ) elif isinstance(variableobj, self.family): # pylint: disable=E1101 - family_name = normalize_family(variableobj.name) + family_name = variableobj.name if namespace != self.rougailconfig['variable_namespace']: family_name = namespace + '.' + family_name self.paths.add_family(namespace, @@ -502,8 +504,6 @@ class RougailObjSpace: if isinstance(variableobj, Redefinable): name = variableobj.name tag = FORCE_TAG.get(child.tag, child.tag) - if child.tag in ['family', 'variable']: - name = normalize_family(name) getattr(space, tag)[name] = variableobj elif isinstance(variableobj, UnRedefinable): getattr(space, child.tag).append(variableobj) diff --git a/src/rougail/utils.py b/src/rougail/utils.py index c94565ea..f80b00de 100644 --- a/src/rougail/utils.py +++ b/src/rougail/utils.py @@ -26,10 +26,26 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ from typing import List from unicodedata import normalize, combining +import re from importlib.machinery import SourceFileLoader from importlib.util import spec_from_loader, module_from_spec +from .i18n import _ +from .error import DictConsistencyError + +NAME_REGEXP = re.compile(r"^[a-z0-9_]*$") + + +def valid_variable_family_name(name: str, + xmlfiles: List[str], + ) -> None: + match = NAME_REGEXP.search(name) + if not match: + msg = _(f'invalid variable or family name "{name}" must only contains ' + 'lowercase ascii character, number or _') + raise DictConsistencyError(msg, 76, xmlfiles) + def normalize_family(family_name: str) -> str: """replace space, accent, uppercase, ... by valid character diff --git a/tests/dictionaries/00load_autosave/00-base.xml b/tests/dictionaries/00load_autosave/00-base.xml index 882ec86f..28d7d0cf 100644 --- a/tests/dictionaries/00load_autosave/00-base.xml +++ b/tests/dictionaries/00load_autosave/00-base.xml @@ -2,7 +2,7 @@ - + non diff --git a/tests/dictionaries/00load_autosaveexpert/00-base.xml b/tests/dictionaries/00load_autosaveexpert/00-base.xml index b2450b1d..63b1dd76 100644 --- a/tests/dictionaries/00load_autosaveexpert/00-base.xml +++ b/tests/dictionaries/00load_autosaveexpert/00-base.xml @@ -2,7 +2,7 @@ - + non diff --git a/tests/dictionaries/00load_comment/00-base.xml b/tests/dictionaries/00load_comment/00-base.xml index 97015669..e781b9f8 100644 --- a/tests/dictionaries/00load_comment/00-base.xml +++ b/tests/dictionaries/00load_comment/00-base.xml @@ -1,7 +1,7 @@ - + - + @@ -24,7 +24,7 @@ oui mode_conteneur_actif mode_conteneur_actif2 - Général2 + general2 diff --git a/tests/dictionaries/10load_leadership_normalize_family/makedict/after.json b/tests/dictionaries/10load_leadership_normalize_family/makedict/after.json deleted file mode 100644 index 6cb952c2..00000000 --- a/tests/dictionaries/10load_leadership_normalize_family/makedict/after.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "rougail.general.mode_conteneur_actif": { - "owner": "default", - "value": "non" - }, - "rougail.general_1.leader.leader": { - "owner": "default", - "value": [] - }, - "rougail.general_1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general_1.leader.follower2": { - "owner": [], - "value": [] - } -} diff --git a/tests/dictionaries/10load_leadership_normalize_family/makedict/base.json b/tests/dictionaries/10load_leadership_normalize_family/makedict/base.json deleted file mode 100644 index 5a7a908d..00000000 --- a/tests/dictionaries/10load_leadership_normalize_family/makedict/base.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "rougail.general.mode_conteneur_actif": "non", - "rougail.general_1.leader.leader": [] -} diff --git a/tests/dictionaries/10load_leadership_normalize_family/makedict/before.json b/tests/dictionaries/10load_leadership_normalize_family/makedict/before.json deleted file mode 100644 index 6cb952c2..00000000 --- a/tests/dictionaries/10load_leadership_normalize_family/makedict/before.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "rougail.general.mode_conteneur_actif": { - "owner": "default", - "value": "non" - }, - "rougail.general_1.leader.leader": { - "owner": "default", - "value": [] - }, - "rougail.general_1.leader.follower1": { - "owner": [], - "value": [] - }, - "rougail.general_1.leader.follower2": { - "owner": [], - "value": [] - } -} diff --git a/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py b/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py deleted file mode 100644 index 8a959c5f..00000000 --- a/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py +++ /dev/null @@ -1,22 +0,0 @@ -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({"mandatory", "normal"})) -option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"})) -option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"mandatory"})) -option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"})) -option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) -option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"basic"})) -option_4 = OptionDescription(name="general_1", doc="general-1", children=[option_5], properties=frozenset({"basic"})) -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_appendaccent/makedict/after.json b/tests/dictionaries/20family_appendaccent/makedict/after.json deleted file mode 100644 index a50319de..00000000 --- a/tests/dictionaries/20family_appendaccent/makedict/after.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "rougail.general.mode_conteneur_actif1": { - "owner": "default", - "value": "non" - }, - "rougail.general.mode_conteneur_actif2": { - "owner": "default", - "value": "non" - }, - "rougail.other.mode_conteneur_actif3": { - "owner": "default", - "value": "non" - } -} diff --git a/tests/dictionaries/20family_appendaccent/makedict/base.json b/tests/dictionaries/20family_appendaccent/makedict/base.json deleted file mode 100644 index ec650bb0..00000000 --- a/tests/dictionaries/20family_appendaccent/makedict/base.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rougail.general.mode_conteneur_actif1": "non", - "rougail.general.mode_conteneur_actif2": "non", - "rougail.other.mode_conteneur_actif3": "non" -} diff --git a/tests/dictionaries/20family_appendaccent/makedict/before.json b/tests/dictionaries/20family_appendaccent/makedict/before.json deleted file mode 100644 index a50319de..00000000 --- a/tests/dictionaries/20family_appendaccent/makedict/before.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "rougail.general.mode_conteneur_actif1": { - "owner": "default", - "value": "non" - }, - "rougail.general.mode_conteneur_actif2": { - "owner": "default", - "value": "non" - }, - "rougail.other.mode_conteneur_actif3": { - "owner": "default", - "value": "non" - } -} diff --git a/tests/dictionaries/20family_appendaccent/tiramisu/base.py b/tests/dictionaries/20family_appendaccent/tiramisu/base.py deleted file mode 100644 index 31ad812c..00000000 --- a/tests/dictionaries/20family_appendaccent/tiramisu/base.py +++ /dev/null @@ -1,21 +0,0 @@ -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_7 = StrOption(name="mode_conteneur_actif3", 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({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))})) -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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_2 = OptionDescription(name="general", doc="Général", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) -option_6 = OptionDescription(name="other", doc="Other", children=[option_7], properties=frozenset({"normal"})) -option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_6]) -option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/40empty_param/00_base.xml b/tests/dictionaries/40empty_param/00_base.xml index c8c7a5f2..155081f5 100644 --- a/tests/dictionaries/40empty_param/00_base.xml +++ b/tests/dictionaries/40empty_param/00_base.xml @@ -3,7 +3,7 @@ - + diff --git a/tests/dictionaries/40empty_param2/00_base.xml b/tests/dictionaries/40empty_param2/00_base.xml index c8e29ae7..dd301fda 100644 --- a/tests/dictionaries/40empty_param2/00_base.xml +++ b/tests/dictionaries/40empty_param2/00_base.xml @@ -3,7 +3,7 @@ - + diff --git a/tests/dictionaries/60action_external/00-base.xml b/tests/dictionaries/60action_external/00-base.xml index fe0ee547..46d87131 100644 --- a/tests/dictionaries/60action_external/00-base.xml +++ b/tests/dictionaries/60action_external/00-base.xml @@ -1,7 +1,7 @@ - + diff --git a/tests/dictionaries/60extra_externalspacecondition/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/00-base.xml index f766ed4e..a525e91a 100644 --- a/tests/dictionaries/60extra_externalspacecondition/00-base.xml +++ b/tests/dictionaries/60extra_externalspacecondition/00-base.xml @@ -1,7 +1,7 @@ - + no diff --git a/tests/dictionaries/60extra_group/00-base.xml b/tests/dictionaries/60extra_group/00-base.xml index 6d1b7533..268c2024 100644 --- a/tests/dictionaries/60extra_group/00-base.xml +++ b/tests/dictionaries/60extra_group/00-base.xml @@ -7,7 +7,7 @@ - + diff --git a/tests/dictionaries/60extra_help/00-base.xml b/tests/dictionaries/60extra_help/00-base.xml index c9079ecb..d8156c27 100644 --- a/tests/dictionaries/60extra_help/00-base.xml +++ b/tests/dictionaries/60extra_help/00-base.xml @@ -8,7 +8,7 @@ - + diff --git a/tests/dictionaries/60extra_load/00-base.xml b/tests/dictionaries/60extra_load/00-base.xml index de43b548..32dae3d3 100644 --- a/tests/dictionaries/60extra_load/00-base.xml +++ b/tests/dictionaries/60extra_load/00-base.xml @@ -1,7 +1,7 @@ - + diff --git a/tests/dictionaries/60extra_mandatory/00-base.xml b/tests/dictionaries/60extra_mandatory/00-base.xml index de43b548..32dae3d3 100644 --- a/tests/dictionaries/60extra_mandatory/00-base.xml +++ b/tests/dictionaries/60extra_mandatory/00-base.xml @@ -1,7 +1,7 @@ - + diff --git a/tests/dictionaries/60extra_no_condition/00-base.xml b/tests/dictionaries/60extra_no_condition/00-base.xml index 4037fc84..4e809b8b 100644 --- a/tests/dictionaries/60extra_no_condition/00-base.xml +++ b/tests/dictionaries/60extra_no_condition/00-base.xml @@ -1,7 +1,7 @@ - + non diff --git a/tests/dictionaries/60extra_redefine/00-base.xml b/tests/dictionaries/60extra_redefine/00-base.xml index de43b548..32dae3d3 100644 --- a/tests/dictionaries/60extra_redefine/00-base.xml +++ b/tests/dictionaries/60extra_redefine/00-base.xml @@ -1,7 +1,7 @@ - + diff --git a/tests/dictionaries/60extra_variable_name_extra/00-base.xml b/tests/dictionaries/60extra_variable_name_extra/00-base.xml index de43b548..32dae3d3 100644 --- a/tests/dictionaries/60extra_variable_name_extra/00-base.xml +++ b/tests/dictionaries/60extra_variable_name_extra/00-base.xml @@ -1,7 +1,7 @@ - + diff --git a/tests/dictionaries/60familyaction/00-base.xml b/tests/dictionaries/60familyaction/00-base.xml index fe0ee547..46d87131 100644 --- a/tests/dictionaries/60familyaction/00-base.xml +++ b/tests/dictionaries/60familyaction/00-base.xml @@ -1,7 +1,7 @@ - + diff --git a/tests/dictionaries/60familyaction_accent/makedict/after.json b/tests/dictionaries/60familyaction_accent/makedict/after.json deleted file mode 100644 index 00d8ee8c..00000000 --- a/tests/dictionaries/60familyaction_accent/makedict/after.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "rougail.general.mode_conteneur_actif": { - "owner": "default", - "value": "non" - }, - "extra.test.delay": { - "owner": "default", - "value": 0 - } -} diff --git a/tests/dictionaries/60familyaction_accent/makedict/base.json b/tests/dictionaries/60familyaction_accent/makedict/base.json deleted file mode 100644 index 9a96ae51..00000000 --- a/tests/dictionaries/60familyaction_accent/makedict/base.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "rougail.general.mode_conteneur_actif": "non", - "extra.test.delay": 0 -} diff --git a/tests/dictionaries/60familyaction_accent/makedict/before.json b/tests/dictionaries/60familyaction_accent/makedict/before.json deleted file mode 100644 index 00d8ee8c..00000000 --- a/tests/dictionaries/60familyaction_accent/makedict/before.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "rougail.general.mode_conteneur_actif": { - "owner": "default", - "value": "non" - }, - "extra.test.delay": { - "owner": "default", - "value": 0 - } -} diff --git a/tests/dictionaries/60familyaction_accent/tiramisu/base.py b/tests/dictionaries/60familyaction_accent/tiramisu/base.py deleted file mode 100644 index 6f61d69e..00000000 --- a/tests/dictionaries/60familyaction_accent/tiramisu/base.py +++ /dev/null @@ -1,20 +0,0 @@ -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="général", children=[option_3], properties=frozenset({"normal"})) -option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) -option_6 = IntOption(name="delay", doc="délai en minutes avant lancement", default=0, properties=frozenset({"mandatory", "normal"})) -option_5 = OptionDescription(name="test", doc="test", 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/60familyaction_mandatory/00-base.xml b/tests/dictionaries/60familyaction_mandatory/00-base.xml index fe0ee547..46d87131 100644 --- a/tests/dictionaries/60familyaction_mandatory/00-base.xml +++ b/tests/dictionaries/60familyaction_mandatory/00-base.xml @@ -1,7 +1,7 @@ - + diff --git a/tests/dictionaries/61extra_auto_freeze/00-base.xml b/tests/dictionaries/61extra_auto_freeze/00-base.xml index 761ed99c..a41f67c6 100644 --- a/tests/dictionaries/61extra_auto_freeze/00-base.xml +++ b/tests/dictionaries/61extra_auto_freeze/00-base.xml @@ -1,7 +1,7 @@ - + - nut_monitor_host diff --git a/tests/dictionaries/80condition_itself/00-base.xml b/tests/dictionaries/80condition_itself/00-base.xml index 0938579d..cec7d54f 100644 --- a/tests/dictionaries/80condition_itself/00-base.xml +++ b/tests/dictionaries/80condition_itself/00-base.xml @@ -2,11 +2,11 @@ - + - + leader-leader replicationType diff --git a/tests/dictionaries/80container_files_symlink_without_source/00-base.xml b/tests/dictionaries/80container_files_symlink_without_source/00-base.xml index 770da073..2b582d74 100644 --- a/tests/dictionaries/80container_files_symlink_without_source/00-base.xml +++ b/tests/dictionaries/80container_files_symlink_without_source/00-base.xml @@ -6,7 +6,7 @@ - + diff --git a/tests/dictionaries/80container_filesredefine_error/00-base.xml b/tests/dictionaries/80container_filesredefine_error/00-base.xml index cab09549..2bdfa029 100644 --- a/tests/dictionaries/80container_filesredefine_error/00-base.xml +++ b/tests/dictionaries/80container_filesredefine_error/00-base.xml @@ -1,15 +1,12 @@ - /etc/mailname - - - + diff --git a/tests/dictionaries/80empty_param_number/00_base.xml b/tests/dictionaries/80empty_param_number/00_base.xml index 3a916091..ec51ecd9 100644 --- a/tests/dictionaries/80empty_param_number/00_base.xml +++ b/tests/dictionaries/80empty_param_number/00_base.xml @@ -1,9 +1,7 @@ - - - + @@ -11,7 +9,6 @@ - diff --git a/tests/dictionaries/80empty_typeeole_eole/00_base.xml b/tests/dictionaries/80empty_typeeole_eole/00_base.xml index f711df19..306c2d0b 100644 --- a/tests/dictionaries/80empty_typeeole_eole/00_base.xml +++ b/tests/dictionaries/80empty_typeeole_eole/00_base.xml @@ -3,7 +3,7 @@ - + diff --git a/tests/dictionaries/80empty_typeeole_number/00_base.xml b/tests/dictionaries/80empty_typeeole_number/00_base.xml index 65196e0f..41cc206a 100644 --- a/tests/dictionaries/80empty_typeeole_number/00_base.xml +++ b/tests/dictionaries/80empty_typeeole_number/00_base.xml @@ -1,25 +1,19 @@ - - - - - - - 3127 - - + + + + 3127 + - non 3128 toto2 - toto1 + toto1 - diff --git a/tests/dictionaries/60extra_externalspaceauto/00-base.xml b/tests/dictionaries/80extra_externalspaceauto/00-base.xml similarity index 84% rename from tests/dictionaries/60extra_externalspaceauto/00-base.xml rename to tests/dictionaries/80extra_externalspaceauto/00-base.xml index 804dc25d..0217e0ff 100644 --- a/tests/dictionaries/60extra_externalspaceauto/00-base.xml +++ b/tests/dictionaries/80extra_externalspaceauto/00-base.xml @@ -1,7 +1,7 @@ - + diff --git a/tests/dictionaries/01fill_baseaccent/__init__.py b/tests/dictionaries/80extra_externalspaceauto/__init__.py similarity index 100% rename from tests/dictionaries/01fill_baseaccent/__init__.py rename to tests/dictionaries/80extra_externalspaceauto/__init__.py diff --git a/tests/dictionaries/60extra_externalspaceauto/errno_41 b/tests/dictionaries/80extra_externalspaceauto/errno_41 similarity index 100% rename from tests/dictionaries/60extra_externalspaceauto/errno_41 rename to tests/dictionaries/80extra_externalspaceauto/errno_41 diff --git a/tests/dictionaries/60extra_externalspaceauto/extra_dirs/extra/00-base.xml b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/dictionaries/60extra_externalspaceauto/extra_dirs/extra/00-base.xml rename to tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra/00-base.xml diff --git a/tests/dictionaries/60extra_externalspaceauto/extra_dirs/extra1/00-base.xml b/tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml similarity index 100% rename from tests/dictionaries/60extra_externalspaceauto/extra_dirs/extra1/00-base.xml rename to tests/dictionaries/80extra_externalspaceauto/extra_dirs/extra1/00-base.xml diff --git a/tests/dictionaries/60extra_externalspacecondition2/00-base.xml b/tests/dictionaries/80extra_externalspacecondition2/00-base.xml similarity index 84% rename from tests/dictionaries/60extra_externalspacecondition2/00-base.xml rename to tests/dictionaries/80extra_externalspacecondition2/00-base.xml index 804dc25d..0217e0ff 100644 --- a/tests/dictionaries/60extra_externalspacecondition2/00-base.xml +++ b/tests/dictionaries/80extra_externalspacecondition2/00-base.xml @@ -1,7 +1,7 @@ - + diff --git a/tests/dictionaries/10leadership_accent/__init__.py b/tests/dictionaries/80extra_externalspacecondition2/__init__.py similarity index 100% rename from tests/dictionaries/10leadership_accent/__init__.py rename to tests/dictionaries/80extra_externalspacecondition2/__init__.py diff --git a/tests/dictionaries/60extra_externalspacecondition2/errno_38 b/tests/dictionaries/80extra_externalspacecondition2/errno_38 similarity index 100% rename from tests/dictionaries/60extra_externalspacecondition2/errno_38 rename to tests/dictionaries/80extra_externalspacecondition2/errno_38 diff --git a/tests/dictionaries/60extra_externalspacecondition2/extra_dirs/extra/00-base.xml b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/dictionaries/60extra_externalspacecondition2/extra_dirs/extra/00-base.xml rename to tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra/00-base.xml diff --git a/tests/dictionaries/60extra_externalspacecondition2/extra_dirs/extra1/00-base.xml b/tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml similarity index 100% rename from tests/dictionaries/60extra_externalspacecondition2/extra_dirs/extra1/00-base.xml rename to tests/dictionaries/80extra_externalspacecondition2/extra_dirs/extra1/00-base.xml diff --git a/tests/dictionaries/60extra_externalspacecondition3/00-base.xml b/tests/dictionaries/80extra_externalspacecondition3/00-base.xml similarity index 84% rename from tests/dictionaries/60extra_externalspacecondition3/00-base.xml rename to tests/dictionaries/80extra_externalspacecondition3/00-base.xml index 804dc25d..0217e0ff 100644 --- a/tests/dictionaries/60extra_externalspacecondition3/00-base.xml +++ b/tests/dictionaries/80extra_externalspacecondition3/00-base.xml @@ -1,7 +1,7 @@ - + diff --git a/tests/dictionaries/10leadership_accent_leader/__init__.py b/tests/dictionaries/80extra_externalspacecondition3/__init__.py similarity index 100% rename from tests/dictionaries/10leadership_accent_leader/__init__.py rename to tests/dictionaries/80extra_externalspacecondition3/__init__.py diff --git a/tests/dictionaries/60extra_externalspacecondition3/errno_38 b/tests/dictionaries/80extra_externalspacecondition3/errno_38 similarity index 100% rename from tests/dictionaries/60extra_externalspacecondition3/errno_38 rename to tests/dictionaries/80extra_externalspacecondition3/errno_38 diff --git a/tests/dictionaries/60extra_externalspacecondition3/extra_dirs/extra/00-base.xml b/tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/dictionaries/60extra_externalspacecondition3/extra_dirs/extra/00-base.xml rename to tests/dictionaries/80extra_externalspacecondition3/extra_dirs/extra/00-base.xml diff --git a/tests/dictionaries/80extra_rougail/00-base.xml b/tests/dictionaries/80extra_rougail/00-base.xml index de43b548..d8b5f8f0 100644 --- a/tests/dictionaries/80extra_rougail/00-base.xml +++ b/tests/dictionaries/80extra_rougail/00-base.xml @@ -1,7 +1,7 @@ - + diff --git a/tests/dictionaries/80extra_services/00-base.xml b/tests/dictionaries/80extra_services/00-base.xml index de43b548..d8b5f8f0 100644 --- a/tests/dictionaries/80extra_services/00-base.xml +++ b/tests/dictionaries/80extra_services/00-base.xml @@ -1,7 +1,7 @@ - + diff --git a/tests/dictionaries/20family_appendaccent/00-base.xml b/tests/dictionaries/80family_appendaccent/00-base.xml similarity index 100% rename from tests/dictionaries/20family_appendaccent/00-base.xml rename to tests/dictionaries/80family_appendaccent/00-base.xml diff --git a/tests/dictionaries/20family_appendaccent/01-base.xml b/tests/dictionaries/80family_appendaccent/01-base.xml similarity index 100% rename from tests/dictionaries/20family_appendaccent/01-base.xml rename to tests/dictionaries/80family_appendaccent/01-base.xml diff --git a/tests/dictionaries/20family_appendaccent/02-base.xml b/tests/dictionaries/80family_appendaccent/02-base.xml similarity index 100% rename from tests/dictionaries/20family_appendaccent/02-base.xml rename to tests/dictionaries/80family_appendaccent/02-base.xml diff --git a/tests/dictionaries/10leadership_familyaccent/__init__.py b/tests/dictionaries/80family_appendaccent/__init__.py similarity index 100% rename from tests/dictionaries/10leadership_familyaccent/__init__.py rename to tests/dictionaries/80family_appendaccent/__init__.py diff --git a/tests/dictionaries/10load_disabled_if_inaccent_family/__init__.py b/tests/dictionaries/80family_appendaccent/errno_76 similarity index 100% rename from tests/dictionaries/10load_disabled_if_inaccent_family/__init__.py rename to tests/dictionaries/80family_appendaccent/errno_76 diff --git a/tests/dictionaries/60familyaction_accent/00-base.xml b/tests/dictionaries/80familyaction_accent/00-base.xml similarity index 100% rename from tests/dictionaries/60familyaction_accent/00-base.xml rename to tests/dictionaries/80familyaction_accent/00-base.xml diff --git a/tests/dictionaries/10load_leadership_normalize_family/__init__.py b/tests/dictionaries/80familyaction_accent/__init__.py similarity index 100% rename from tests/dictionaries/10load_leadership_normalize_family/__init__.py rename to tests/dictionaries/80familyaction_accent/__init__.py diff --git a/tests/dictionaries/20family_appendaccent/__init__.py b/tests/dictionaries/80familyaction_accent/errno_76 similarity index 100% rename from tests/dictionaries/20family_appendaccent/__init__.py rename to tests/dictionaries/80familyaction_accent/errno_76 diff --git a/tests/dictionaries/60familyaction_accent/extra_dirs/extra/00-base.xml b/tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/dictionaries/60familyaction_accent/extra_dirs/extra/00-base.xml rename to tests/dictionaries/80familyaction_accent/extra_dirs/extra/00-base.xml diff --git a/tests/dictionaries/01fill_baseaccent/00-base.xml b/tests/dictionaries/80fill_baseaccent/00-base.xml similarity index 100% rename from tests/dictionaries/01fill_baseaccent/00-base.xml rename to tests/dictionaries/80fill_baseaccent/00-base.xml diff --git a/tests/dictionaries/60extra_externalspaceauto/__init__.py b/tests/dictionaries/80fill_baseaccent/__init__.py similarity index 100% rename from tests/dictionaries/60extra_externalspaceauto/__init__.py rename to tests/dictionaries/80fill_baseaccent/__init__.py diff --git a/tests/dictionaries/60extra_externalspacecondition2/__init__.py b/tests/dictionaries/80fill_baseaccent/errno_76 similarity index 100% rename from tests/dictionaries/60extra_externalspacecondition2/__init__.py rename to tests/dictionaries/80fill_baseaccent/errno_76 diff --git a/tests/dictionaries/10leadership_accent/00-base.xml b/tests/dictionaries/80leadership_accent/00-base.xml similarity index 100% rename from tests/dictionaries/10leadership_accent/00-base.xml rename to tests/dictionaries/80leadership_accent/00-base.xml diff --git a/tests/dictionaries/60extra_externalspacecondition3/__init__.py b/tests/dictionaries/80leadership_accent/__init__.py similarity index 100% rename from tests/dictionaries/60extra_externalspacecondition3/__init__.py rename to tests/dictionaries/80leadership_accent/__init__.py diff --git a/tests/dictionaries/60familyaction_accent/__init__.py b/tests/dictionaries/80leadership_accent/errno_76 similarity index 100% rename from tests/dictionaries/60familyaction_accent/__init__.py rename to tests/dictionaries/80leadership_accent/errno_76 diff --git a/tests/dictionaries/10leadership_accent_leader/00-base.xml b/tests/dictionaries/80leadership_accent_leader/00-base.xml similarity index 100% rename from tests/dictionaries/10leadership_accent_leader/00-base.xml rename to tests/dictionaries/80leadership_accent_leader/00-base.xml diff --git a/tests/dictionaries/80family_changeaccent/__init__.py b/tests/dictionaries/80leadership_accent_leader/__init__.py similarity index 100% rename from tests/dictionaries/80family_changeaccent/__init__.py rename to tests/dictionaries/80leadership_accent_leader/__init__.py diff --git a/tests/dictionaries/80family_changeaccent/errno_47 b/tests/dictionaries/80leadership_accent_leader/errno_76 similarity index 100% rename from tests/dictionaries/80family_changeaccent/errno_47 rename to tests/dictionaries/80leadership_accent_leader/errno_76 diff --git a/tests/dictionaries/10leadership_familyaccent/00-base.xml b/tests/dictionaries/80leadership_familyaccent/00-base.xml similarity index 100% rename from tests/dictionaries/10leadership_familyaccent/00-base.xml rename to tests/dictionaries/80leadership_familyaccent/00-base.xml diff --git a/tests/dictionaries/80leadership_familyaccent/__init__.py b/tests/dictionaries/80leadership_familyaccent/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/80leadership_familyaccent/errno_76 b/tests/dictionaries/80leadership_familyaccent/errno_76 new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/10load_disabled_if_inaccent_family/00-base.xml b/tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml similarity index 100% rename from tests/dictionaries/10load_disabled_if_inaccent_family/00-base.xml rename to tests/dictionaries/80load_disabled_if_inaccent_family/00-base.xml diff --git a/tests/dictionaries/80load_disabled_if_inaccent_family/__init__.py b/tests/dictionaries/80load_disabled_if_inaccent_family/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/80load_disabled_if_inaccent_family/errno_76 b/tests/dictionaries/80load_disabled_if_inaccent_family/errno_76 new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/10load_leadership_normalize_family/00-base.xml b/tests/dictionaries/80load_leadership_normalize_family/00-base.xml similarity index 100% rename from tests/dictionaries/10load_leadership_normalize_family/00-base.xml rename to tests/dictionaries/80load_leadership_normalize_family/00-base.xml diff --git a/tests/dictionaries/10load_leadership_normalize_family/01-base.xml b/tests/dictionaries/80load_leadership_normalize_family/01-base.xml similarity index 100% rename from tests/dictionaries/10load_leadership_normalize_family/01-base.xml rename to tests/dictionaries/80load_leadership_normalize_family/01-base.xml diff --git a/tests/dictionaries/80load_leadership_normalize_family/__init__.py b/tests/dictionaries/80load_leadership_normalize_family/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/80load_leadership_normalize_family/errno_76 b/tests/dictionaries/80load_leadership_normalize_family/errno_76 new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/80mode_conflict/00-base.xml b/tests/dictionaries/80mode_conflict/00-base.xml index 52f4562b..b13b1ea0 100644 --- a/tests/dictionaries/80mode_conflict/00-base.xml +++ b/tests/dictionaries/80mode_conflict/00-base.xml @@ -2,7 +2,7 @@ - + non diff --git a/tests/dictionaries/80variable_accent/00-base.xml b/tests/dictionaries/80variable_accent/00-base.xml new file mode 100644 index 00000000..ac4a4ffe --- /dev/null +++ b/tests/dictionaries/80variable_accent/00-base.xml @@ -0,0 +1,23 @@ + + + + + + non + + + + + + + + + non + mode_conteneur_actif + + + + diff --git a/tests/dictionaries/80family_changeaccent/00-base.xml b/tests/dictionaries/80variable_accent/01-base.xml similarity index 62% rename from tests/dictionaries/80family_changeaccent/00-base.xml rename to tests/dictionaries/80variable_accent/01-base.xml index fad8e995..b31afe12 100644 --- a/tests/dictionaries/80family_changeaccent/00-base.xml +++ b/tests/dictionaries/80variable_accent/01-base.xml @@ -2,14 +2,9 @@ - - diff --git a/tests/dictionaries/80family_changeaccent/01-base.xml b/tests/dictionaries/80variable_accent/02-base.xml similarity index 57% rename from tests/dictionaries/80family_changeaccent/01-base.xml rename to tests/dictionaries/80variable_accent/02-base.xml index 5fb2b1f5..81155361 100644 --- a/tests/dictionaries/80family_changeaccent/01-base.xml +++ b/tests/dictionaries/80variable_accent/02-base.xml @@ -1,8 +1,8 @@ - - + + diff --git a/tests/dictionaries/80variable_accent/__init__.py b/tests/dictionaries/80variable_accent/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/80variable_accent/errno_76 b/tests/dictionaries/80variable_accent/errno_76 new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/80variable_up/00-base.xml b/tests/dictionaries/80variable_up/00-base.xml new file mode 100644 index 00000000..443f4139 --- /dev/null +++ b/tests/dictionaries/80variable_up/00-base.xml @@ -0,0 +1,23 @@ + + + + + + non + + + + + + + + + non + mode_conteneur_actif + + + + diff --git a/tests/dictionaries/80variable_up/__init__.py b/tests/dictionaries/80variable_up/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/80variable_up/errno_76 b/tests/dictionaries/80variable_up/errno_76 new file mode 100644 index 00000000..e69de29b diff --git a/tests/dictionaries/81extra_externalspace/00-base.xml b/tests/dictionaries/81extra_externalspace/00-base.xml index 804dc25d..5249b01e 100644 --- a/tests/dictionaries/81extra_externalspace/00-base.xml +++ b/tests/dictionaries/81extra_externalspace/00-base.xml @@ -1,7 +1,7 @@ - +