diff --git a/src/rougail/config.py b/src/rougail/config.py index 671693d7..948b8f62 100644 --- a/src/rougail/config.py +++ b/src/rougail/config.py @@ -3,17 +3,20 @@ fichier de configuration pour rougail """ -from os.path import join, isfile, abspath, dirname -from pathlib import Path +from os.path import join, abspath, dirname -rougailroot = '/var/rougail' -patch_dir = join(rougailroot, 'patches') -manifests_dir = join(rougailroot, 'manifests') -templates_dir = join(rougailroot, 'templates') + +rougailroot = '/var/rougail' dtddir = join(dirname(abspath(__file__)), 'data') -dtdfilename = join(dtddir, 'rougail.dtd') -# chemin du répertoire source des fichiers templates -patch_dir = '/srv/rougail/patch' -variable_namespace = 'rougail' +Config = {'rougailroot': rougailroot, + 'patch_dir': join(rougailroot, 'patches'), + 'manifests_dir': join(rougailroot, 'manifests'), + 'templates_dir': join(rougailroot, 'templates'), + 'dtdfilename': join(dtddir, 'rougail.dtd'), + 'dtddir': dtddir, + # chemin du répertoire source des fichiers templates + 'patch_dir': '/srv/rougail/patch', + 'variable_namespace': 'rougail', + } diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py index 4b076f5d..cc205a3e 100644 --- a/src/rougail/objspace.py +++ b/src/rougail/objspace.py @@ -32,7 +32,7 @@ from .tiramisureflector import TiramisuReflector from .utils import normalize_family from .error import OperationError, SpaceObjShallNotBeUpdated, DictConsistencyError from .path import Path -from .config import variable_namespace +from .config import Config # CreoleObjSpace's elements like 'family' or 'follower', that shall be forced to the Redefinable type FORCE_REDEFINABLES = ('family', 'follower', 'service', 'disknod', 'variables') @@ -329,7 +329,7 @@ class CreoleObjSpace: def is_already_exists(self, name, space, child, namespace): if isinstance(space, self.family): # pylint: disable=E1101 - if namespace != variable_namespace: + if namespace != Config['variable_namespace']: name = space.path + '.' + name return self.paths.path_is_defined(name) if child.tag == 'family': @@ -362,14 +362,14 @@ class CreoleObjSpace: else: norm_name = name return getattr(family, variable.tag)[norm_name] - if namespace == variable_namespace: + if namespace == Config['variable_namespace']: path = name else: path = family.path + '.' + name old_family_name = self.paths.get_variable_family_name(path) if normalize_family(family.name) == old_family_name: return getattr(family, variable.tag)[name] - old_family = self.space.variables[variable_namespace].family[old_family_name] # pylint: disable=E1101 + old_family = self.space.variables[Config['variable_namespace']].family[old_family_name] # pylint: disable=E1101 variable_obj = old_family.variable[name] del old_family.variable[name] if 'variable' not in vars(family): @@ -501,7 +501,7 @@ class CreoleObjSpace: document.attrib.get('dynamic') != None, variableobj) if child.attrib.get('redefine', 'False') == 'True': - if namespace == variable_namespace: + if namespace == Config['variable_namespace']: self.redefine_variables.append(child.attrib['name']) else: self.redefine_variables.append(namespace + '.' + family_name + '.' + @@ -509,7 +509,7 @@ class CreoleObjSpace: elif child.tag == 'family': family_name = normalize_family(child.attrib['name']) - if namespace != variable_namespace: + if namespace != Config['variable_namespace']: family_name = namespace + '.' + family_name self.paths.add_family(namespace, family_name, diff --git a/src/rougail/path.py b/src/rougail/path.py index 7f0c62db..d3fe8e81 100644 --- a/src/rougail/path.py +++ b/src/rougail/path.py @@ -1,7 +1,7 @@ from .i18n import _ from .utils import normalize_family from .error import OperationError, DictConsistencyError -from .config import variable_namespace +from .config import Config class Path: @@ -21,7 +21,7 @@ class Path: name: str, variableobj: str, ) -> str: # pylint: disable=C0111 - if '.' not in name and namespace == variable_namespace: + if '.' not in name and namespace == Config['variable_namespace']: full_name = '.'.join([namespace, name]) self.full_paths[name] = full_name else: @@ -41,12 +41,12 @@ class Path: check_name=False, allow_dot=True, ) - if '.' not in name and current_namespace == variable_namespace and name in self.full_paths: + if '.' not in name and current_namespace == Config['variable_namespace'] and name in self.full_paths: name = self.full_paths[name] if current_namespace is None: # pragma: no cover raise OperationError('current_namespace must not be None') dico = self.families[name] - if dico['namespace'] != variable_namespace and current_namespace != dico['namespace']: + if dico['namespace'] != Config['variable_namespace'] and current_namespace != dico['namespace']: raise DictConsistencyError(_('A family located in the {} namespace ' 'shall not be used in the {} namespace').format( dico['namespace'], current_namespace)) @@ -87,7 +87,7 @@ class Path: False, dico['variableobj'], ) - if namespace == variable_namespace: + if namespace == Config['variable_namespace']: self.full_paths[name] = new_path else: name = new_path @@ -113,7 +113,7 @@ class Path: self.full_paths[name] = full_name else: full_name = name - if namespace == variable_namespace: + if namespace == Config['variable_namespace']: name = name.rsplit('.', 1)[1] self.variables[full_name] = dict(name=name, family=family, @@ -157,7 +157,7 @@ class Path: else: dico = self._get_variable(name) if not allow_source: - if dico['namespace'] not in [variable_namespace, 'services'] and current_namespace != dico['namespace']: + if dico['namespace'] not in [Config['variable_namespace'], 'services'] and current_namespace != dico['namespace']: raise DictConsistencyError(_('A variable located in the {} namespace ' 'shall not be used in the {} namespace').format( dico['namespace'], current_namespace)) diff --git a/src/rougail/template.py b/src/rougail/template.py index b715e1a9..a2d583b3 100644 --- a/src/rougail/template.py +++ b/src/rougail/template.py @@ -16,13 +16,13 @@ from Cheetah.Template import Template as ChtTemplate from Cheetah.NameMapper import NotFound as CheetahNotFound try: - from tiramisu import Config - from tiramisu.error import PropertiesOptionError -except: from tiramisu3 import Config from tiramisu3.error import PropertiesOptionError +except: + from tiramisu import Config + from tiramisu.error import PropertiesOptionError -from .config import patch_dir, variable_namespace +from .config import Config from .error import FileNotFound, TemplateError from .i18n import _ from .utils import normalize_family @@ -294,7 +294,7 @@ class CreoleTemplateEngine: patch_no_debug = ['-s', '-r', '-', '--backup-if-mismatch'] # patches variante + locaux - for directory in [join(patch_dir, 'variante'), patch_dir]: + for directory in [join(Config['patch_dir'], 'variante'), Config['patch_dir']]: patch_file = join(directory, f'{filename}.patch') if isfile(patch_file): log.info(_("Patching template '{filename}' with '{patch_file}'")) @@ -376,7 +376,7 @@ class CreoleTemplateEngine: """ for option in await self.config.option.list(type='all'): namespace = await option.option.name() - if namespace == variable_namespace: + if namespace == Config['variable_namespace']: await self.load_eole_variables_rougail(option) else: families = await self.load_eole_variables(namespace, diff --git a/src/rougail/tiramisu.py b/src/rougail/tiramisu.py index caae09f2..44b3d259 100644 --- a/src/rougail/tiramisu.py +++ b/src/rougail/tiramisu.py @@ -1,7 +1,7 @@ try: - from tiramisu import DynOptionDescription -except: from tiramisu3 import DynOptionDescription +except: + from tiramisu import DynOptionDescription from .utils import normalize_family diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index 649c0b0a..dde73e9e 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -1,10 +1,7 @@ """loader flattened XML specific """ -from os.path import isfile -from lxml.etree import DTD - -from .config import dtdfilename, variable_namespace +from .config import Config from .i18n import _ from .error import LoaderError from .annotator import ERASED_ATTRIBUTES @@ -48,9 +45,9 @@ class TiramisuReflector: ): self.storage = ElementStorage() self.storage.text = ["try:", - " from tiramisu import *", - "except:", " from tiramisu3 import *", + "except:", + " from tiramisu import *", "from rougail.tiramisu import ConvertDynOptionDescription", "import imp", f"func = imp.load_source('func', '{funcs_path}')", @@ -83,10 +80,10 @@ class TiramisuReflector: # variable_namespace family has to be loaded before any other family # because `extra` family could use `variable_namespace` variables. if hasattr(xmlroot, 'variables'): - if variable_namespace in xmlroot.variables: - yield xmlroot.variables[variable_namespace] + if Config['variable_namespace'] in xmlroot.variables: + yield xmlroot.variables[Config['variable_namespace']] for xmlelt, value in xmlroot.variables.items(): - if xmlelt != variable_namespace: + if xmlelt != Config['variable_namespace']: yield value if hasattr(xmlroot, 'services'): yield xmlroot.services diff --git a/tests/flattener_dicos/00empty/00_base.xml b/tests/dictionaries/00empty/00_base.xml similarity index 100% rename from tests/flattener_dicos/00empty/00_base.xml rename to tests/dictionaries/00empty/00_base.xml diff --git a/tests/flattener_dicos/00empty/__init__.py b/tests/dictionaries/00empty/__init__.py similarity index 100% rename from tests/flattener_dicos/00empty/__init__.py rename to tests/dictionaries/00empty/__init__.py diff --git a/tests/flattener_dicos/00empty/tiramisu/__init__.py b/tests/dictionaries/00empty/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/00empty/tiramisu/__init__.py rename to tests/dictionaries/00empty/tiramisu/__init__.py diff --git a/tests/flattener_dicos/00empty/tiramisu/base.py b/tests/dictionaries/00empty/tiramisu/base.py similarity index 73% rename from tests/flattener_dicos/00empty/tiramisu/base.py rename to tests/dictionaries/00empty/tiramisu/base.py index 833ce194..500aecf5 100644 --- a/tests/flattener_dicos/00empty/tiramisu/base.py +++ b/tests/dictionaries/00empty/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_2 = OptionDescription(name='tata', doc='tata', children=[]) option_2.impl_set_information("manage", True) option_1 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_2]) diff --git a/tests/flattener_dicos/00load_autofreeze/00-base.xml b/tests/dictionaries/00load_autofreeze/00-base.xml similarity index 100% rename from tests/flattener_dicos/00load_autofreeze/00-base.xml rename to tests/dictionaries/00load_autofreeze/00-base.xml diff --git a/tests/flattener_dicos/00load_autofreeze/__init__.py b/tests/dictionaries/00load_autofreeze/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_autofreeze/__init__.py rename to tests/dictionaries/00load_autofreeze/__init__.py diff --git a/tests/flattener_dicos/00load_autofreeze/makedict/base.json b/tests/dictionaries/00load_autofreeze/makedict/base.json similarity index 100% rename from tests/flattener_dicos/00load_autofreeze/makedict/base.json rename to tests/dictionaries/00load_autofreeze/makedict/base.json diff --git a/tests/flattener_dicos/00load_autofreeze/tiramisu/__init__.py b/tests/dictionaries/00load_autofreeze/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_autofreeze/tiramisu/__init__.py rename to tests/dictionaries/00load_autofreeze/tiramisu/__init__.py diff --git a/tests/flattener_dicos/00load_autofreeze/tiramisu/base.py b/tests/dictionaries/00load_autofreeze/tiramisu/base.py similarity index 86% rename from tests/flattener_dicos/00load_autofreeze/tiramisu/base.py rename to tests/dictionaries/00load_autofreeze/tiramisu/base.py index a083b32e..4d92e9f0 100644 --- a/tests/flattener_dicos/00load_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreeze/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3 = ChoiceOption(properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/00load_autofreezeexpert/00-base.xml b/tests/dictionaries/00load_autofreezeexpert/00-base.xml similarity index 100% rename from tests/flattener_dicos/00load_autofreezeexpert/00-base.xml rename to tests/dictionaries/00load_autofreezeexpert/00-base.xml diff --git a/tests/flattener_dicos/00load_autofreezeexpert/__init__.py b/tests/dictionaries/00load_autofreezeexpert/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_autofreezeexpert/__init__.py rename to tests/dictionaries/00load_autofreezeexpert/__init__.py diff --git a/tests/flattener_dicos/00load_autofreezeexpert/makedict/base.json b/tests/dictionaries/00load_autofreezeexpert/makedict/base.json similarity index 100% rename from tests/flattener_dicos/00load_autofreezeexpert/makedict/base.json rename to tests/dictionaries/00load_autofreezeexpert/makedict/base.json diff --git a/tests/flattener_dicos/00load_autofreezeexpert/tiramisu/__init__.py b/tests/dictionaries/00load_autofreezeexpert/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_autofreezeexpert/tiramisu/__init__.py rename to tests/dictionaries/00load_autofreezeexpert/tiramisu/__init__.py diff --git a/tests/flattener_dicos/00load_autofreezeexpert/tiramisu/base.py b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py similarity index 86% rename from tests/flattener_dicos/00load_autofreezeexpert/tiramisu/base.py rename to tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py index 9b3ac130..446cb043 100644 --- a/tests/flattener_dicos/00load_autofreezeexpert/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3 = ChoiceOption(properties=frozenset({'auto_freeze', 'expert', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/00load_autosave/00-base.xml b/tests/dictionaries/00load_autosave/00-base.xml similarity index 100% rename from tests/flattener_dicos/00load_autosave/00-base.xml rename to tests/dictionaries/00load_autosave/00-base.xml diff --git a/tests/flattener_dicos/00load_autosave/__init__.py b/tests/dictionaries/00load_autosave/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_autosave/__init__.py rename to tests/dictionaries/00load_autosave/__init__.py diff --git a/tests/flattener_dicos/00load_autosave/makedict/base.json b/tests/dictionaries/00load_autosave/makedict/base.json similarity index 100% rename from tests/flattener_dicos/00load_autosave/makedict/base.json rename to tests/dictionaries/00load_autosave/makedict/base.json diff --git a/tests/flattener_dicos/00load_autosave/tiramisu/__init__.py b/tests/dictionaries/00load_autosave/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_autosave/tiramisu/__init__.py rename to tests/dictionaries/00load_autosave/tiramisu/__init__.py diff --git a/tests/flattener_dicos/00load_autosave/tiramisu/base.py b/tests/dictionaries/00load_autosave/tiramisu/base.py similarity index 79% rename from tests/flattener_dicos/00load_autosave/tiramisu/base.py rename to tests/dictionaries/00load_autosave/tiramisu/base.py index bd4a6687..6a1fa723 100644 --- a/tests/flattener_dicos/00load_autosave/tiramisu/base.py +++ b/tests/dictionaries/00load_autosave/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'basic', 'force_store_value', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/00load_autosaveexpert/00-base.xml b/tests/dictionaries/00load_autosaveexpert/00-base.xml similarity index 100% rename from tests/flattener_dicos/00load_autosaveexpert/00-base.xml rename to tests/dictionaries/00load_autosaveexpert/00-base.xml diff --git a/tests/flattener_dicos/00load_autosaveexpert/__init__.py b/tests/dictionaries/00load_autosaveexpert/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_autosaveexpert/__init__.py rename to tests/dictionaries/00load_autosaveexpert/__init__.py diff --git a/tests/flattener_dicos/00load_autosaveexpert/makedict/base.json b/tests/dictionaries/00load_autosaveexpert/makedict/base.json similarity index 100% rename from tests/flattener_dicos/00load_autosaveexpert/makedict/base.json rename to tests/dictionaries/00load_autosaveexpert/makedict/base.json diff --git a/tests/flattener_dicos/00load_autosaveexpert/tiramisu/__init__.py b/tests/dictionaries/00load_autosaveexpert/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_autosaveexpert/tiramisu/__init__.py rename to tests/dictionaries/00load_autosaveexpert/tiramisu/__init__.py diff --git a/tests/flattener_dicos/00load_autosaveexpert/tiramisu/base.py b/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py similarity index 79% rename from tests/flattener_dicos/00load_autosaveexpert/tiramisu/base.py rename to tests/dictionaries/00load_autosaveexpert/tiramisu/base.py index 5645cd8a..a5e922f7 100644 --- a/tests/flattener_dicos/00load_autosaveexpert/tiramisu/base.py +++ b/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'expert', 'force_store_value', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'expert'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/00load_comment/00-base.xml b/tests/dictionaries/00load_comment/00-base.xml similarity index 100% rename from tests/flattener_dicos/00load_comment/00-base.xml rename to tests/dictionaries/00load_comment/00-base.xml diff --git a/tests/flattener_dicos/00load_comment/__init__.py b/tests/dictionaries/00load_comment/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_comment/__init__.py rename to tests/dictionaries/00load_comment/__init__.py diff --git a/tests/flattener_dicos/00load_comment/makedict/base.json b/tests/dictionaries/00load_comment/makedict/base.json similarity index 100% rename from tests/flattener_dicos/00load_comment/makedict/base.json rename to tests/dictionaries/00load_comment/makedict/base.json diff --git a/tests/flattener_dicos/00load_comment/tiramisu/__init__.py b/tests/dictionaries/00load_comment/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_comment/tiramisu/__init__.py rename to tests/dictionaries/00load_comment/tiramisu/__init__.py diff --git a/tests/flattener_dicos/00load_comment/tiramisu/base.py b/tests/dictionaries/00load_comment/tiramisu/base.py similarity index 80% rename from tests/flattener_dicos/00load_comment/tiramisu/base.py rename to tests/dictionaries/00load_comment/tiramisu/base.py index 7cdb8020..f844f854 100644 --- a/tests/flattener_dicos/00load_comment/tiramisu/base.py +++ b/tests/dictionaries/00load_comment/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/00load_notype/00-base.xml b/tests/dictionaries/00load_notype/00-base.xml similarity index 100% rename from tests/flattener_dicos/00load_notype/00-base.xml rename to tests/dictionaries/00load_notype/00-base.xml diff --git a/tests/flattener_dicos/00load_notype/__init__.py b/tests/dictionaries/00load_notype/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_notype/__init__.py rename to tests/dictionaries/00load_notype/__init__.py diff --git a/tests/flattener_dicos/00load_notype/makedict/base.json b/tests/dictionaries/00load_notype/makedict/base.json similarity index 100% rename from tests/flattener_dicos/00load_notype/makedict/base.json rename to tests/dictionaries/00load_notype/makedict/base.json diff --git a/tests/flattener_dicos/00load_notype/tiramisu/__init__.py b/tests/dictionaries/00load_notype/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_notype/tiramisu/__init__.py rename to tests/dictionaries/00load_notype/tiramisu/__init__.py diff --git a/tests/flattener_dicos/00load_notype/tiramisu/base.py b/tests/dictionaries/00load_notype/tiramisu/base.py similarity index 83% rename from tests/flattener_dicos/00load_notype/tiramisu/base.py rename to tests/dictionaries/00load_notype/tiramisu/base.py index 55cd4021..1a591eac 100644 --- a/tests/flattener_dicos/00load_notype/tiramisu/base.py +++ b/tests/dictionaries/00load_notype/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='without_type', doc='without_type', multi=False, default='non') option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/00load_save/00-base.xml b/tests/dictionaries/00load_save/00-base.xml similarity index 100% rename from tests/flattener_dicos/00load_save/00-base.xml rename to tests/dictionaries/00load_save/00-base.xml diff --git a/tests/flattener_dicos/00load_save/__init__.py b/tests/dictionaries/00load_save/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_save/__init__.py rename to tests/dictionaries/00load_save/__init__.py diff --git a/tests/flattener_dicos/00load_save/makedict/base.json b/tests/dictionaries/00load_save/makedict/base.json similarity index 100% rename from tests/flattener_dicos/00load_save/makedict/base.json rename to tests/dictionaries/00load_save/makedict/base.json diff --git a/tests/flattener_dicos/00load_save/tiramisu/__init__.py b/tests/dictionaries/00load_save/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_save/tiramisu/__init__.py rename to tests/dictionaries/00load_save/tiramisu/__init__.py diff --git a/tests/flattener_dicos/00load_save/tiramisu/base.py b/tests/dictionaries/00load_save/tiramisu/base.py similarity index 80% rename from tests/flattener_dicos/00load_save/tiramisu/base.py rename to tests/dictionaries/00load_save/tiramisu/base.py index 7cdb8020..f844f854 100644 --- a/tests/flattener_dicos/00load_save/tiramisu/base.py +++ b/tests/dictionaries/00load_save/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/00load_subfolder/99-base.xml b/tests/dictionaries/00load_subfolder/99-base.xml similarity index 100% rename from tests/flattener_dicos/00load_subfolder/99-base.xml rename to tests/dictionaries/00load_subfolder/99-base.xml diff --git a/tests/flattener_dicos/00load_subfolder/__init__.py b/tests/dictionaries/00load_subfolder/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_subfolder/__init__.py rename to tests/dictionaries/00load_subfolder/__init__.py diff --git a/tests/flattener_dicos/00load_subfolder/makedict/base.json b/tests/dictionaries/00load_subfolder/makedict/base.json similarity index 100% rename from tests/flattener_dicos/00load_subfolder/makedict/base.json rename to tests/dictionaries/00load_subfolder/makedict/base.json diff --git a/tests/flattener_dicos/00load_subfolder/subfolder/00-base.xml b/tests/dictionaries/00load_subfolder/subfolder/00-base.xml similarity index 100% rename from tests/flattener_dicos/00load_subfolder/subfolder/00-base.xml rename to tests/dictionaries/00load_subfolder/subfolder/00-base.xml diff --git a/tests/flattener_dicos/00load_subfolder/tiramisu/__init__.py b/tests/dictionaries/00load_subfolder/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/00load_subfolder/tiramisu/__init__.py rename to tests/dictionaries/00load_subfolder/tiramisu/__init__.py diff --git a/tests/flattener_dicos/00load_subfolder/tiramisu/base.py b/tests/dictionaries/00load_subfolder/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/00load_subfolder/tiramisu/base.py rename to tests/dictionaries/00load_subfolder/tiramisu/base.py index b18dd933..9daa0bf4 100644 --- a/tests/flattener_dicos/00load_subfolder/tiramisu/base.py +++ b/tests/dictionaries/00load_subfolder/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/01auto_base/00-base.xml b/tests/dictionaries/01auto_base/00-base.xml similarity index 100% rename from tests/flattener_dicos/01auto_base/00-base.xml rename to tests/dictionaries/01auto_base/00-base.xml diff --git a/tests/flattener_dicos/01auto_base/__init__.py b/tests/dictionaries/01auto_base/__init__.py similarity index 100% rename from tests/flattener_dicos/01auto_base/__init__.py rename to tests/dictionaries/01auto_base/__init__.py diff --git a/tests/flattener_dicos/01auto_base/makedict/base.json b/tests/dictionaries/01auto_base/makedict/base.json similarity index 100% rename from tests/flattener_dicos/01auto_base/makedict/base.json rename to tests/dictionaries/01auto_base/makedict/base.json diff --git a/tests/flattener_dicos/01auto_base/tiramisu/__init__.py b/tests/dictionaries/01auto_base/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/01auto_base/tiramisu/__init__.py rename to tests/dictionaries/01auto_base/tiramisu/__init__.py diff --git a/tests/flattener_dicos/01auto_base/tiramisu/base.py b/tests/dictionaries/01auto_base/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/01auto_base/tiramisu/base.py rename to tests/dictionaries/01auto_base/tiramisu/base.py index 4bde6b10..f5e62662 100644 --- a/tests/flattener_dicos/01auto_base/tiramisu/base.py +++ b/tests/dictionaries/01auto_base/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/01auto_withoutparam/00-base.xml b/tests/dictionaries/01auto_withoutparam/00-base.xml similarity index 100% rename from tests/flattener_dicos/01auto_withoutparam/00-base.xml rename to tests/dictionaries/01auto_withoutparam/00-base.xml diff --git a/tests/flattener_dicos/01auto_withoutparam/__init__.py b/tests/dictionaries/01auto_withoutparam/__init__.py similarity index 100% rename from tests/flattener_dicos/01auto_withoutparam/__init__.py rename to tests/dictionaries/01auto_withoutparam/__init__.py diff --git a/tests/flattener_dicos/01auto_withoutparam/makedict/base.json b/tests/dictionaries/01auto_withoutparam/makedict/base.json similarity index 100% rename from tests/flattener_dicos/01auto_withoutparam/makedict/base.json rename to tests/dictionaries/01auto_withoutparam/makedict/base.json diff --git a/tests/flattener_dicos/01auto_withoutparam/tiramisu/__init__.py b/tests/dictionaries/01auto_withoutparam/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/01auto_withoutparam/tiramisu/__init__.py rename to tests/dictionaries/01auto_withoutparam/tiramisu/__init__.py diff --git a/tests/flattener_dicos/01auto_withoutparam/tiramisu/base.py b/tests/dictionaries/01auto_withoutparam/tiramisu/base.py similarity index 84% rename from tests/flattener_dicos/01auto_withoutparam/tiramisu/base.py rename to tests/dictionaries/01auto_withoutparam/tiramisu/base.py index e544a13d..f4dabd5c 100644 --- a/tests/flattener_dicos/01auto_withoutparam/tiramisu/base.py +++ b/tests/dictionaries/01auto_withoutparam/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((), kwargs={})), values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/01base_multi/00-base.xml b/tests/dictionaries/01base_multi/00-base.xml similarity index 100% rename from tests/flattener_dicos/01base_multi/00-base.xml rename to tests/dictionaries/01base_multi/00-base.xml diff --git a/tests/flattener_dicos/01base_multi/__init__.py b/tests/dictionaries/01base_multi/__init__.py similarity index 100% rename from tests/flattener_dicos/01base_multi/__init__.py rename to tests/dictionaries/01base_multi/__init__.py diff --git a/tests/flattener_dicos/01base_multi/makedict/base.json b/tests/dictionaries/01base_multi/makedict/base.json similarity index 100% rename from tests/flattener_dicos/01base_multi/makedict/base.json rename to tests/dictionaries/01base_multi/makedict/base.json diff --git a/tests/flattener_dicos/01base_multi/tiramisu/__init__.py b/tests/dictionaries/01base_multi/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/01base_multi/tiramisu/__init__.py rename to tests/dictionaries/01base_multi/tiramisu/__init__.py diff --git a/tests/flattener_dicos/01base_multi/tiramisu/base.py b/tests/dictionaries/01base_multi/tiramisu/base.py similarity index 81% rename from tests/flattener_dicos/01base_multi/tiramisu/base.py rename to tests/dictionaries/01base_multi/tiramisu/base.py index 7d88cf18..3142ff75 100644 --- a/tests/flattener_dicos/01base_multi/tiramisu/base.py +++ b/tests/dictionaries/01base_multi/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Redefine description', multi=True, default=['non'], default_multi='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/01fill_autofreeze/00-base.xml b/tests/dictionaries/01fill_autofreeze/00-base.xml similarity index 100% rename from tests/flattener_dicos/01fill_autofreeze/00-base.xml rename to tests/dictionaries/01fill_autofreeze/00-base.xml diff --git a/tests/flattener_dicos/01fill_autofreeze/__init__.py b/tests/dictionaries/01fill_autofreeze/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_autofreeze/__init__.py rename to tests/dictionaries/01fill_autofreeze/__init__.py diff --git a/tests/flattener_dicos/01fill_autofreeze/makedict/base.json b/tests/dictionaries/01fill_autofreeze/makedict/base.json similarity index 100% rename from tests/flattener_dicos/01fill_autofreeze/makedict/base.json rename to tests/dictionaries/01fill_autofreeze/makedict/base.json diff --git a/tests/flattener_dicos/01fill_autofreeze/tiramisu/__init__.py b/tests/dictionaries/01fill_autofreeze/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_autofreeze/tiramisu/__init__.py rename to tests/dictionaries/01fill_autofreeze/tiramisu/__init__.py diff --git a/tests/flattener_dicos/01fill_autofreeze/tiramisu/base.py b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/01fill_autofreeze/tiramisu/base.py rename to tests/dictionaries/01fill_autofreeze/tiramisu/base.py index 204501b5..80f274a7 100644 --- a/tests/flattener_dicos/01fill_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3 = ChoiceOption(properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non')) diff --git a/tests/flattener_dicos/01fill_autosave/00-base.xml b/tests/dictionaries/01fill_autosave/00-base.xml similarity index 100% rename from tests/flattener_dicos/01fill_autosave/00-base.xml rename to tests/dictionaries/01fill_autosave/00-base.xml diff --git a/tests/flattener_dicos/01fill_autosave/__init__.py b/tests/dictionaries/01fill_autosave/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_autosave/__init__.py rename to tests/dictionaries/01fill_autosave/__init__.py diff --git a/tests/flattener_dicos/01fill_autosave/makedict/base.json b/tests/dictionaries/01fill_autosave/makedict/base.json similarity index 100% rename from tests/flattener_dicos/01fill_autosave/makedict/base.json rename to tests/dictionaries/01fill_autosave/makedict/base.json diff --git a/tests/flattener_dicos/01fill_autosave/tiramisu/__init__.py b/tests/dictionaries/01fill_autosave/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_autosave/tiramisu/__init__.py rename to tests/dictionaries/01fill_autosave/tiramisu/__init__.py diff --git a/tests/flattener_dicos/01fill_autosave/tiramisu/base.py b/tests/dictionaries/01fill_autosave/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/01fill_autosave/tiramisu/base.py rename to tests/dictionaries/01fill_autosave/tiramisu/base.py index 7be599f8..5a2b79f9 100644 --- a/tests/flattener_dicos/01fill_autosave/tiramisu/base.py +++ b/tests/dictionaries/01fill_autosave/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3 = ChoiceOption(properties=frozenset({'basic', 'force_store_value', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/01fill_base/00-base.xml b/tests/dictionaries/01fill_base/00-base.xml similarity index 100% rename from tests/flattener_dicos/01fill_base/00-base.xml rename to tests/dictionaries/01fill_base/00-base.xml diff --git a/tests/flattener_dicos/01fill_base/__init__.py b/tests/dictionaries/01fill_base/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_base/__init__.py rename to tests/dictionaries/01fill_base/__init__.py diff --git a/tests/flattener_dicos/01fill_base/makedict/base.json b/tests/dictionaries/01fill_base/makedict/base.json similarity index 100% rename from tests/flattener_dicos/01fill_base/makedict/base.json rename to tests/dictionaries/01fill_base/makedict/base.json diff --git a/tests/flattener_dicos/01fill_base/tiramisu/__init__.py b/tests/dictionaries/01fill_base/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_base/tiramisu/__init__.py rename to tests/dictionaries/01fill_base/tiramisu/__init__.py diff --git a/tests/flattener_dicos/01fill_optional/tiramisu/base.py b/tests/dictionaries/01fill_base/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/01fill_optional/tiramisu/base.py rename to tests/dictionaries/01fill_base/tiramisu/base.py index 4bde6b10..f5e62662 100644 --- a/tests/flattener_dicos/01fill_optional/tiramisu/base.py +++ b/tests/dictionaries/01fill_base/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/01fill_baseaccent/00-base.xml b/tests/dictionaries/01fill_baseaccent/00-base.xml similarity index 100% rename from tests/flattener_dicos/01fill_baseaccent/00-base.xml rename to tests/dictionaries/01fill_baseaccent/00-base.xml diff --git a/tests/flattener_dicos/01fill_baseaccent/__init__.py b/tests/dictionaries/01fill_baseaccent/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_baseaccent/__init__.py rename to tests/dictionaries/01fill_baseaccent/__init__.py diff --git a/tests/flattener_dicos/01fill_baseaccent/makedict/base.json b/tests/dictionaries/01fill_baseaccent/makedict/base.json similarity index 100% rename from tests/flattener_dicos/01fill_baseaccent/makedict/base.json rename to tests/dictionaries/01fill_baseaccent/makedict/base.json diff --git a/tests/flattener_dicos/01fill_baseaccent/tiramisu/__init__.py b/tests/dictionaries/01fill_baseaccent/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_baseaccent/tiramisu/__init__.py rename to tests/dictionaries/01fill_baseaccent/tiramisu/__init__.py diff --git a/tests/flattener_dicos/01fill_baseaccent/tiramisu/base.py b/tests/dictionaries/01fill_baseaccent/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/01fill_baseaccent/tiramisu/base.py rename to tests/dictionaries/01fill_baseaccent/tiramisu/base.py index 5268f551..e40af6b5 100644 --- a/tests/flattener_dicos/01fill_baseaccent/tiramisu/base.py +++ b/tests/dictionaries/01fill_baseaccent/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/01fill_mandatory/00-base.xml b/tests/dictionaries/01fill_mandatory/00-base.xml similarity index 100% rename from tests/flattener_dicos/01fill_mandatory/00-base.xml rename to tests/dictionaries/01fill_mandatory/00-base.xml diff --git a/tests/flattener_dicos/01fill_mandatory/__init__.py b/tests/dictionaries/01fill_mandatory/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_mandatory/__init__.py rename to tests/dictionaries/01fill_mandatory/__init__.py diff --git a/tests/flattener_dicos/01fill_mandatory/makedict/base.json b/tests/dictionaries/01fill_mandatory/makedict/base.json similarity index 100% rename from tests/flattener_dicos/01fill_mandatory/makedict/base.json rename to tests/dictionaries/01fill_mandatory/makedict/base.json diff --git a/tests/flattener_dicos/01fill_mandatory/tiramisu/__init__.py b/tests/dictionaries/01fill_mandatory/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_mandatory/tiramisu/__init__.py rename to tests/dictionaries/01fill_mandatory/tiramisu/__init__.py diff --git a/tests/flattener_dicos/01fill_mandatory/tiramisu/base.py b/tests/dictionaries/01fill_mandatory/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/01fill_mandatory/tiramisu/base.py rename to tests/dictionaries/01fill_mandatory/tiramisu/base.py index ca545b2f..97c28412 100644 --- a/tests/flattener_dicos/01fill_mandatory/tiramisu/base.py +++ b/tests/dictionaries/01fill_mandatory/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3 = DomainnameOption(type='domainname', allow_ip=False, properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}))) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/01fill_number/00-base.xml b/tests/dictionaries/01fill_number/00-base.xml similarity index 100% rename from tests/flattener_dicos/01fill_number/00-base.xml rename to tests/dictionaries/01fill_number/00-base.xml diff --git a/tests/flattener_dicos/01fill_number/__init__.py b/tests/dictionaries/01fill_number/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_number/__init__.py rename to tests/dictionaries/01fill_number/__init__.py diff --git a/tests/flattener_dicos/01fill_number/makedict/base.json b/tests/dictionaries/01fill_number/makedict/base.json similarity index 100% rename from tests/flattener_dicos/01fill_number/makedict/base.json rename to tests/dictionaries/01fill_number/makedict/base.json diff --git a/tests/flattener_dicos/01fill_number/tiramisu/__init__.py b/tests/dictionaries/01fill_number/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_number/tiramisu/__init__.py rename to tests/dictionaries/01fill_number/tiramisu/__init__.py diff --git a/tests/flattener_dicos/01fill_number/tiramisu/base.py b/tests/dictionaries/01fill_number/tiramisu/base.py similarity index 84% rename from tests/flattener_dicos/01fill_number/tiramisu/base.py rename to tests/dictionaries/01fill_number/tiramisu/base.py index 5f841652..c6820d77 100644 --- a/tests/flattener_dicos/01fill_number/tiramisu/base.py +++ b/tests/dictionaries/01fill_number/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = IntOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue(3)), kwargs={}))) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/01fill_optional/00-base.xml b/tests/dictionaries/01fill_optional/00-base.xml similarity index 100% rename from tests/flattener_dicos/01fill_optional/00-base.xml rename to tests/dictionaries/01fill_optional/00-base.xml diff --git a/tests/flattener_dicos/01fill_optional/__init__.py b/tests/dictionaries/01fill_optional/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_optional/__init__.py rename to tests/dictionaries/01fill_optional/__init__.py diff --git a/tests/flattener_dicos/01fill_optional/makedict/base.json b/tests/dictionaries/01fill_optional/makedict/base.json similarity index 100% rename from tests/flattener_dicos/01fill_optional/makedict/base.json rename to tests/dictionaries/01fill_optional/makedict/base.json diff --git a/tests/flattener_dicos/01fill_optional/tiramisu/__init__.py b/tests/dictionaries/01fill_optional/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/01fill_optional/tiramisu/__init__.py rename to tests/dictionaries/01fill_optional/tiramisu/__init__.py diff --git a/tests/flattener_dicos/01fill_base/tiramisu/base.py b/tests/dictionaries/01fill_optional/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/01fill_base/tiramisu/base.py rename to tests/dictionaries/01fill_optional/tiramisu/base.py index 4bde6b10..f5e62662 100644 --- a/tests/flattener_dicos/01fill_base/tiramisu/base.py +++ b/tests/dictionaries/01fill_optional/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/01separator_base/00-base.xml b/tests/dictionaries/01separator_base/00-base.xml similarity index 100% rename from tests/flattener_dicos/01separator_base/00-base.xml rename to tests/dictionaries/01separator_base/00-base.xml diff --git a/tests/flattener_dicos/01separator_base/__init__.py b/tests/dictionaries/01separator_base/__init__.py similarity index 100% rename from tests/flattener_dicos/01separator_base/__init__.py rename to tests/dictionaries/01separator_base/__init__.py diff --git a/tests/flattener_dicos/01separator_base/makedict/base.json b/tests/dictionaries/01separator_base/makedict/base.json similarity index 100% rename from tests/flattener_dicos/01separator_base/makedict/base.json rename to tests/dictionaries/01separator_base/makedict/base.json diff --git a/tests/flattener_dicos/01separator_base/tiramisu/__init__.py b/tests/dictionaries/01separator_base/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/01separator_base/tiramisu/__init__.py rename to tests/dictionaries/01separator_base/tiramisu/__init__.py diff --git a/tests/flattener_dicos/01separator_base/tiramisu/base.py b/tests/dictionaries/01separator_base/tiramisu/base.py similarity index 81% rename from tests/flattener_dicos/01separator_base/tiramisu/base.py rename to tests/dictionaries/01separator_base/tiramisu/base.py index 516f74b8..5f2f202d 100644 --- a/tests/flattener_dicos/01separator_base/tiramisu/base.py +++ b/tests/dictionaries/01separator_base/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3.impl_set_information("separator", "Établissement") option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) diff --git a/tests/flattener_dicos/01separator_neverhidden/00-base.xml b/tests/dictionaries/01separator_neverhidden/00-base.xml similarity index 100% rename from tests/flattener_dicos/01separator_neverhidden/00-base.xml rename to tests/dictionaries/01separator_neverhidden/00-base.xml diff --git a/tests/flattener_dicos/01separator_neverhidden/__init__.py b/tests/dictionaries/01separator_neverhidden/__init__.py similarity index 100% rename from tests/flattener_dicos/01separator_neverhidden/__init__.py rename to tests/dictionaries/01separator_neverhidden/__init__.py diff --git a/tests/flattener_dicos/01separator_neverhidden/makedict/base.json b/tests/dictionaries/01separator_neverhidden/makedict/base.json similarity index 100% rename from tests/flattener_dicos/01separator_neverhidden/makedict/base.json rename to tests/dictionaries/01separator_neverhidden/makedict/base.json diff --git a/tests/flattener_dicos/01separator_neverhidden/tiramisu/__init__.py b/tests/dictionaries/01separator_neverhidden/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/01separator_neverhidden/tiramisu/__init__.py rename to tests/dictionaries/01separator_neverhidden/tiramisu/__init__.py diff --git a/tests/flattener_dicos/01separator_neverhidden/tiramisu/base.py b/tests/dictionaries/01separator_neverhidden/tiramisu/base.py similarity index 81% rename from tests/flattener_dicos/01separator_neverhidden/tiramisu/base.py rename to tests/dictionaries/01separator_neverhidden/tiramisu/base.py index 516f74b8..5f2f202d 100644 --- a/tests/flattener_dicos/01separator_neverhidden/tiramisu/base.py +++ b/tests/dictionaries/01separator_neverhidden/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3.impl_set_information("separator", "Établissement") option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) diff --git a/tests/flattener_dicos/10autosave_hidden/00-base.xml b/tests/dictionaries/10autosave_hidden/00-base.xml similarity index 100% rename from tests/flattener_dicos/10autosave_hidden/00-base.xml rename to tests/dictionaries/10autosave_hidden/00-base.xml diff --git a/tests/flattener_dicos/10autosave_hidden/__init__.py b/tests/dictionaries/10autosave_hidden/__init__.py similarity index 100% rename from tests/flattener_dicos/10autosave_hidden/__init__.py rename to tests/dictionaries/10autosave_hidden/__init__.py diff --git a/tests/flattener_dicos/10autosave_hidden/makedict/base.json b/tests/dictionaries/10autosave_hidden/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10autosave_hidden/makedict/base.json rename to tests/dictionaries/10autosave_hidden/makedict/base.json diff --git a/tests/flattener_dicos/10autosave_hidden/tiramisu/__init__.py b/tests/dictionaries/10autosave_hidden/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10autosave_hidden/tiramisu/__init__.py rename to tests/dictionaries/10autosave_hidden/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10autosave_hidden/tiramisu/base.py b/tests/dictionaries/10autosave_hidden/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/10autosave_hidden/tiramisu/base.py rename to tests/dictionaries/10autosave_hidden/tiramisu/base.py index cd5be2c6..cae64eb6 100644 --- a/tests/flattener_dicos/10autosave_hidden/tiramisu/base.py +++ b/tests/dictionaries/10autosave_hidden/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = StrOption(properties=frozenset({'basic', 'force_store_value', 'frozen', 'hidden', 'mandatory'}), name='autosavevar', doc='autosave variable', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={}))) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/00-base.xml b/tests/dictionaries/10autosave_hidden_frozenifin/00-base.xml similarity index 100% rename from tests/flattener_dicos/10autosave_hidden_frozenifin/00-base.xml rename to tests/dictionaries/10autosave_hidden_frozenifin/00-base.xml diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/__init__.py b/tests/dictionaries/10autosave_hidden_frozenifin/__init__.py similarity index 100% rename from tests/flattener_dicos/10autosave_hidden_frozenifin/__init__.py rename to tests/dictionaries/10autosave_hidden_frozenifin/__init__.py diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/makedict/base.json b/tests/dictionaries/10autosave_hidden_frozenifin/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10autosave_hidden_frozenifin/makedict/base.json rename to tests/dictionaries/10autosave_hidden_frozenifin/makedict/base.json diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/tiramisu/__init__.py b/tests/dictionaries/10autosave_hidden_frozenifin/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10autosave_hidden_frozenifin/tiramisu/__init__.py rename to tests/dictionaries/10autosave_hidden_frozenifin/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/tiramisu/base.py b/tests/dictionaries/10autosave_hidden_frozenifin/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/10autosave_hidden_frozenifin/tiramisu/base.py rename to tests/dictionaries/10autosave_hidden_frozenifin/tiramisu/base.py index 12d974df..c3577921 100644 --- a/tests/flattener_dicos/10autosave_hidden_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/10autosave_hidden_frozenifin/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = StrOption(properties=frozenset({'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='autosavevar', doc='autosave variable', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={}))) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/10check_base/00-base.xml b/tests/dictionaries/10check_base/00-base.xml similarity index 100% rename from tests/flattener_dicos/10check_base/00-base.xml rename to tests/dictionaries/10check_base/00-base.xml diff --git a/tests/flattener_dicos/10check_base/__init__.py b/tests/dictionaries/10check_base/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_base/__init__.py rename to tests/dictionaries/10check_base/__init__.py diff --git a/tests/flattener_dicos/10check_base/makedict/base.json b/tests/dictionaries/10check_base/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10check_base/makedict/base.json rename to tests/dictionaries/10check_base/makedict/base.json diff --git a/tests/flattener_dicos/10check_base/tiramisu/__init__.py b/tests/dictionaries/10check_base/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_base/tiramisu/__init__.py rename to tests/dictionaries/10check_base/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10check_base/tiramisu/base.py b/tests/dictionaries/10check_base/tiramisu/base.py similarity index 81% rename from tests/flattener_dicos/10check_base/tiramisu/base.py rename to tests/dictionaries/10check_base/tiramisu/base.py index 51c4777a..7f214b7c 100644 --- a/tests/flattener_dicos/10check_base/tiramisu/base.py +++ b/tests/dictionaries/10check_base/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='b') option_4 = IntOption(properties=frozenset({'normal'}), name='int', doc='No change', multi=False, max_number=100, min_number=0) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/10check_no_param/00-base.xml b/tests/dictionaries/10check_no_param/00-base.xml similarity index 100% rename from tests/flattener_dicos/10check_no_param/00-base.xml rename to tests/dictionaries/10check_no_param/00-base.xml diff --git a/tests/flattener_dicos/10check_no_param/__init__.py b/tests/dictionaries/10check_no_param/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_no_param/__init__.py rename to tests/dictionaries/10check_no_param/__init__.py diff --git a/tests/flattener_dicos/10check_no_param/makedict/base.json b/tests/dictionaries/10check_no_param/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10check_no_param/makedict/base.json rename to tests/dictionaries/10check_no_param/makedict/base.json diff --git a/tests/flattener_dicos/10check_no_param/tiramisu/__init__.py b/tests/dictionaries/10check_no_param/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_no_param/tiramisu/__init__.py rename to tests/dictionaries/10check_no_param/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10check_no_param/tiramisu/base.py b/tests/dictionaries/10check_no_param/tiramisu/base.py similarity index 83% rename from tests/flattener_dicos/10check_no_param/tiramisu/base.py rename to tests/dictionaries/10check_no_param/tiramisu/base.py index f0fade69..06281772 100644 --- a/tests/flattener_dicos/10check_no_param/tiramisu/base.py +++ b/tests/dictionaries/10check_no_param/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='b') option_4 = IntOption(properties=frozenset({'normal'}), validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={}), warnings_only=False)], name='int', doc='No change', multi=False) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/10check_option/00-base.xml b/tests/dictionaries/10check_option/00-base.xml similarity index 100% rename from tests/flattener_dicos/10check_option/00-base.xml rename to tests/dictionaries/10check_option/00-base.xml diff --git a/tests/flattener_dicos/10check_option/__init__.py b/tests/dictionaries/10check_option/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_option/__init__.py rename to tests/dictionaries/10check_option/__init__.py diff --git a/tests/flattener_dicos/10check_option/makedict/base.json b/tests/dictionaries/10check_option/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10check_option/makedict/base.json rename to tests/dictionaries/10check_option/makedict/base.json diff --git a/tests/flattener_dicos/10check_option/tiramisu/__init__.py b/tests/dictionaries/10check_option/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_option/tiramisu/__init__.py rename to tests/dictionaries/10check_option/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10check_option/tiramisu/base.py b/tests/dictionaries/10check_option/tiramisu/base.py similarity index 86% rename from tests/flattener_dicos/10check_option/tiramisu/base.py rename to tests/dictionaries/10check_option/tiramisu/base.py index 4856560b..9b07c753 100644 --- a/tests/flattener_dicos/10check_option/tiramisu/base.py +++ b/tests/dictionaries/10check_option/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='b') option_4 = IntOption(properties=frozenset({'mandatory', 'normal'}), name='int2', doc='No change', multi=False, default=100) option_5 = IntOption(properties=frozenset({'normal'}), validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={'mini': ParamValue("0"), 'maxi': ParamOption(option_4, notraisepropertyerror=False, todict=False)}), warnings_only=False)], name='int', doc='No change', multi=False) diff --git a/tests/flattener_dicos/10check_optional/00-base.xml b/tests/dictionaries/10check_optional/00-base.xml similarity index 100% rename from tests/flattener_dicos/10check_optional/00-base.xml rename to tests/dictionaries/10check_optional/00-base.xml diff --git a/tests/flattener_dicos/10check_optional/__init__.py b/tests/dictionaries/10check_optional/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_optional/__init__.py rename to tests/dictionaries/10check_optional/__init__.py diff --git a/tests/flattener_dicos/10check_optional/makedict/base.json b/tests/dictionaries/10check_optional/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10check_optional/makedict/base.json rename to tests/dictionaries/10check_optional/makedict/base.json diff --git a/tests/flattener_dicos/10check_optional/tiramisu/__init__.py b/tests/dictionaries/10check_optional/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_optional/tiramisu/__init__.py rename to tests/dictionaries/10check_optional/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10check_optional/tiramisu/base.py b/tests/dictionaries/10check_optional/tiramisu/base.py similarity index 86% rename from tests/flattener_dicos/10check_optional/tiramisu/base.py rename to tests/dictionaries/10check_optional/tiramisu/base.py index 6e665a3c..e921d87f 100644 --- a/tests/flattener_dicos/10check_optional/tiramisu/base.py +++ b/tests/dictionaries/10check_optional/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='b') option_5 = IntOption(properties=frozenset({'normal'}), name='int2', doc='No change', multi=False) option_4 = IntOption(properties=frozenset({'normal'}), validators=[Calculation(func.valid_not_equal, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], name='int', doc='No change', multi=False) diff --git a/tests/flattener_dicos/10check_valid_differ/00-base.xml b/tests/dictionaries/10check_valid_differ/00-base.xml similarity index 100% rename from tests/flattener_dicos/10check_valid_differ/00-base.xml rename to tests/dictionaries/10check_valid_differ/00-base.xml diff --git a/tests/flattener_dicos/10check_valid_differ/__init__.py b/tests/dictionaries/10check_valid_differ/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_valid_differ/__init__.py rename to tests/dictionaries/10check_valid_differ/__init__.py diff --git a/tests/flattener_dicos/10check_valid_differ/makedict/base.json b/tests/dictionaries/10check_valid_differ/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10check_valid_differ/makedict/base.json rename to tests/dictionaries/10check_valid_differ/makedict/base.json diff --git a/tests/flattener_dicos/10check_valid_differ/tiramisu/__init__.py b/tests/dictionaries/10check_valid_differ/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_valid_differ/tiramisu/__init__.py rename to tests/dictionaries/10check_valid_differ/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10check_valid_differ/tiramisu/base.py b/tests/dictionaries/10check_valid_differ/tiramisu/base.py similarity index 86% rename from tests/flattener_dicos/10check_valid_differ/tiramisu/base.py rename to tests/dictionaries/10check_valid_differ/tiramisu/base.py index 2f3adf23..71e1ef29 100644 --- a/tests/flattener_dicos/10check_valid_differ/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_not_equal, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/10check_valid_differ_add/00-base.xml b/tests/dictionaries/10check_valid_differ_add/00-base.xml similarity index 100% rename from tests/flattener_dicos/10check_valid_differ_add/00-base.xml rename to tests/dictionaries/10check_valid_differ_add/00-base.xml diff --git a/tests/flattener_dicos/10check_valid_differ_add/01-base.xml b/tests/dictionaries/10check_valid_differ_add/01-base.xml similarity index 100% rename from tests/flattener_dicos/10check_valid_differ_add/01-base.xml rename to tests/dictionaries/10check_valid_differ_add/01-base.xml diff --git a/tests/flattener_dicos/10check_valid_differ_add/__init__.py b/tests/dictionaries/10check_valid_differ_add/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_valid_differ_add/__init__.py rename to tests/dictionaries/10check_valid_differ_add/__init__.py diff --git a/tests/flattener_dicos/10check_valid_differ_add/makedict/base.json b/tests/dictionaries/10check_valid_differ_add/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10check_valid_differ_add/makedict/base.json rename to tests/dictionaries/10check_valid_differ_add/makedict/base.json diff --git a/tests/flattener_dicos/10check_valid_differ_add/tiramisu/__init__.py b/tests/dictionaries/10check_valid_differ_add/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_valid_differ_add/tiramisu/__init__.py rename to tests/dictionaries/10check_valid_differ_add/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10check_valid_differ_add/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py similarity index 90% rename from tests/flattener_dicos/10check_valid_differ_add/tiramisu/base.py rename to tests/dictionaries/10check_valid_differ_add/tiramisu/base.py index 140a8e5c..a4da3a01 100644 --- a/tests/flattener_dicos/10check_valid_differ_add/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10check_valid_differ_removecheck/00-base.xml b/tests/dictionaries/10check_valid_differ_removecheck/00-base.xml similarity index 100% rename from tests/flattener_dicos/10check_valid_differ_removecheck/00-base.xml rename to tests/dictionaries/10check_valid_differ_removecheck/00-base.xml diff --git a/tests/flattener_dicos/10check_valid_differ_removecheck/01-base.xml b/tests/dictionaries/10check_valid_differ_removecheck/01-base.xml similarity index 100% rename from tests/flattener_dicos/10check_valid_differ_removecheck/01-base.xml rename to tests/dictionaries/10check_valid_differ_removecheck/01-base.xml diff --git a/tests/flattener_dicos/10check_valid_differ_removecheck/__init__.py b/tests/dictionaries/10check_valid_differ_removecheck/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_valid_differ_removecheck/__init__.py rename to tests/dictionaries/10check_valid_differ_removecheck/__init__.py diff --git a/tests/flattener_dicos/10check_valid_differ_removecheck/makedict/base.json b/tests/dictionaries/10check_valid_differ_removecheck/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10check_valid_differ_removecheck/makedict/base.json rename to tests/dictionaries/10check_valid_differ_removecheck/makedict/base.json diff --git a/tests/flattener_dicos/10check_valid_differ_removecheck/tiramisu/__init__.py b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_valid_differ_removecheck/tiramisu/__init__.py rename to tests/dictionaries/10check_valid_differ_removecheck/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10check_valid_differ_removecheck/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py similarity index 90% rename from tests/flattener_dicos/10check_valid_differ_removecheck/tiramisu/base.py rename to tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py index 140a8e5c..a4da3a01 100644 --- a/tests/flattener_dicos/10check_valid_differ_removecheck/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10check_valid_ipnetmask/00-base.xml b/tests/dictionaries/10check_valid_ipnetmask/00-base.xml similarity index 100% rename from tests/flattener_dicos/10check_valid_ipnetmask/00-base.xml rename to tests/dictionaries/10check_valid_ipnetmask/00-base.xml diff --git a/tests/flattener_dicos/10check_valid_ipnetmask/__init__.py b/tests/dictionaries/10check_valid_ipnetmask/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_valid_ipnetmask/__init__.py rename to tests/dictionaries/10check_valid_ipnetmask/__init__.py diff --git a/tests/flattener_dicos/10check_valid_ipnetmask/makedict/base.json b/tests/dictionaries/10check_valid_ipnetmask/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10check_valid_ipnetmask/makedict/base.json rename to tests/dictionaries/10check_valid_ipnetmask/makedict/base.json diff --git a/tests/flattener_dicos/10check_valid_ipnetmask/tiramisu/__init__.py b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10check_valid_ipnetmask/tiramisu/__init__.py rename to tests/dictionaries/10check_valid_ipnetmask/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10check_valid_ipnetmask/tiramisu/base.py b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py similarity index 88% rename from tests/flattener_dicos/10check_valid_ipnetmask/tiramisu/base.py rename to tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py index d0f4a409..0b90eb8d 100644 --- a/tests/flattener_dicos/10check_valid_ipnetmask/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_4 = IPOption(private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'}), name='adresse_ip_eth0', doc='Adresse IP de la carte', multi=False) option_5 = NetmaskOption(properties=frozenset({'basic', 'mandatory'}), validators=[Calculation(func.valid_ip_netmask, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)], name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', multi=False) diff --git a/tests/flattener_dicos/10leadership_append/00-base.xml b/tests/dictionaries/10leadership_append/00-base.xml similarity index 100% rename from tests/flattener_dicos/10leadership_append/00-base.xml rename to tests/dictionaries/10leadership_append/00-base.xml diff --git a/tests/flattener_dicos/10leadership_append/01-base.xml b/tests/dictionaries/10leadership_append/01-base.xml similarity index 100% rename from tests/flattener_dicos/10leadership_append/01-base.xml rename to tests/dictionaries/10leadership_append/01-base.xml diff --git a/tests/flattener_dicos/10leadership_append/__init__.py b/tests/dictionaries/10leadership_append/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_append/__init__.py rename to tests/dictionaries/10leadership_append/__init__.py diff --git a/tests/flattener_dicos/10leadership_append/makedict/base.json b/tests/dictionaries/10leadership_append/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10leadership_append/makedict/base.json rename to tests/dictionaries/10leadership_append/makedict/base.json diff --git a/tests/flattener_dicos/10leadership_append/tiramisu/__init__.py b/tests/dictionaries/10leadership_append/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_append/tiramisu/__init__.py rename to tests/dictionaries/10leadership_append/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10leadership_append/tiramisu/base.py b/tests/dictionaries/10leadership_append/tiramisu/base.py similarity index 90% rename from tests/flattener_dicos/10leadership_append/tiramisu/base.py rename to tests/dictionaries/10leadership_append/tiramisu/base.py index 031afd31..cce65d89 100644 --- a/tests/flattener_dicos/10leadership_append/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True) diff --git a/tests/flattener_dicos/10leadership_auto/00-base.xml b/tests/dictionaries/10leadership_auto/00-base.xml similarity index 100% rename from tests/flattener_dicos/10leadership_auto/00-base.xml rename to tests/dictionaries/10leadership_auto/00-base.xml diff --git a/tests/flattener_dicos/10leadership_auto/__init__.py b/tests/dictionaries/10leadership_auto/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_auto/__init__.py rename to tests/dictionaries/10leadership_auto/__init__.py diff --git a/tests/flattener_dicos/10leadership_auto/makedict/base.json b/tests/dictionaries/10leadership_auto/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10leadership_auto/makedict/base.json rename to tests/dictionaries/10leadership_auto/makedict/base.json diff --git a/tests/flattener_dicos/10leadership_auto/tiramisu/__init__.py b/tests/dictionaries/10leadership_auto/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_auto/tiramisu/__init__.py rename to tests/dictionaries/10leadership_auto/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10leadership_auto/tiramisu/base.py b/tests/dictionaries/10leadership_auto/tiramisu/base.py similarity index 91% rename from tests/flattener_dicos/10leadership_auto/tiramisu/base.py rename to tests/dictionaries/10leadership_auto/tiramisu/base.py index 5f95d40d..5835c366 100644 --- a/tests/flattener_dicos/10leadership_auto/tiramisu/base.py +++ b/tests/dictionaries/10leadership_auto/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) diff --git a/tests/flattener_dicos/10leadership_autoleader/00-base.xml b/tests/dictionaries/10leadership_autoleader/00-base.xml similarity index 100% rename from tests/flattener_dicos/10leadership_autoleader/00-base.xml rename to tests/dictionaries/10leadership_autoleader/00-base.xml diff --git a/tests/flattener_dicos/10leadership_autoleader/__init__.py b/tests/dictionaries/10leadership_autoleader/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_autoleader/__init__.py rename to tests/dictionaries/10leadership_autoleader/__init__.py diff --git a/tests/flattener_dicos/10leadership_autoleader/makedict/base.json b/tests/dictionaries/10leadership_autoleader/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10leadership_autoleader/makedict/base.json rename to tests/dictionaries/10leadership_autoleader/makedict/base.json diff --git a/tests/flattener_dicos/10leadership_autoleader/tiramisu/__init__.py b/tests/dictionaries/10leadership_autoleader/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_autoleader/tiramisu/__init__.py rename to tests/dictionaries/10leadership_autoleader/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10leadership_autoleader/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/10leadership_autoleader/tiramisu/base.py rename to tests/dictionaries/10leadership_autoleader/tiramisu/base.py index b8c12fbb..39832fd8 100644 --- a/tests/flattener_dicos/10leadership_autoleader/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) diff --git a/tests/flattener_dicos/10leadership_autoleader_expert/00-base.xml b/tests/dictionaries/10leadership_autoleader_expert/00-base.xml similarity index 100% rename from tests/flattener_dicos/10leadership_autoleader_expert/00-base.xml rename to tests/dictionaries/10leadership_autoleader_expert/00-base.xml diff --git a/tests/flattener_dicos/10leadership_autoleader_expert/__init__.py b/tests/dictionaries/10leadership_autoleader_expert/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_autoleader_expert/__init__.py rename to tests/dictionaries/10leadership_autoleader_expert/__init__.py diff --git a/tests/flattener_dicos/10leadership_autoleader_expert/makedict/base.json b/tests/dictionaries/10leadership_autoleader_expert/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10leadership_autoleader_expert/makedict/base.json rename to tests/dictionaries/10leadership_autoleader_expert/makedict/base.json diff --git a/tests/flattener_dicos/10leadership_autoleader_expert/tiramisu/__init__.py b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_autoleader_expert/tiramisu/__init__.py rename to tests/dictionaries/10leadership_autoleader_expert/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10leadership_autoleader_expert/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/10leadership_autoleader_expert/tiramisu/base.py rename to tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py index 92137f38..d727ed5e 100644 --- a/tests/flattener_dicos/10leadership_autoleader_expert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_6 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")}))) diff --git a/tests/flattener_dicos/10leadership_autosaveexpert/00-base.xml b/tests/dictionaries/10leadership_autosaveexpert/00-base.xml similarity index 100% rename from tests/flattener_dicos/10leadership_autosaveexpert/00-base.xml rename to tests/dictionaries/10leadership_autosaveexpert/00-base.xml diff --git a/tests/flattener_dicos/10leadership_autosaveexpert/__init__.py b/tests/dictionaries/10leadership_autosaveexpert/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_autosaveexpert/__init__.py rename to tests/dictionaries/10leadership_autosaveexpert/__init__.py diff --git a/tests/flattener_dicos/10leadership_autosaveexpert/makedict/base.json b/tests/dictionaries/10leadership_autosaveexpert/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10leadership_autosaveexpert/makedict/base.json rename to tests/dictionaries/10leadership_autosaveexpert/makedict/base.json diff --git a/tests/flattener_dicos/10leadership_autosaveexpert/tiramisu/__init__.py b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_autosaveexpert/tiramisu/__init__.py rename to tests/dictionaries/10leadership_autosaveexpert/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10leadership_autosaveexpert/tiramisu/base.py b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/10leadership_autosaveexpert/tiramisu/base.py rename to tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py index 902d56e0..d3be72cc 100644 --- a/tests/flattener_dicos/10leadership_autosaveexpert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) diff --git a/tests/flattener_dicos/10leadership_familyaccent/00-base.xml b/tests/dictionaries/10leadership_familyaccent/00-base.xml similarity index 100% rename from tests/flattener_dicos/10leadership_familyaccent/00-base.xml rename to tests/dictionaries/10leadership_familyaccent/00-base.xml diff --git a/tests/flattener_dicos/10leadership_familyaccent/__init__.py b/tests/dictionaries/10leadership_familyaccent/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_familyaccent/__init__.py rename to tests/dictionaries/10leadership_familyaccent/__init__.py diff --git a/tests/flattener_dicos/10leadership_familyaccent/makedict/base.json b/tests/dictionaries/10leadership_familyaccent/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10leadership_familyaccent/makedict/base.json rename to tests/dictionaries/10leadership_familyaccent/makedict/base.json diff --git a/tests/flattener_dicos/10leadership_familyaccent/tiramisu/__init__.py b/tests/dictionaries/10leadership_familyaccent/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_familyaccent/tiramisu/__init__.py rename to tests/dictionaries/10leadership_familyaccent/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10leadership_familyaccent/tiramisu/base.py b/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/10leadership_familyaccent/tiramisu/base.py rename to tests/dictionaries/10leadership_familyaccent/tiramisu/base.py index e2974971..76d72b2d 100644 --- a/tests/flattener_dicos/10leadership_familyaccent/tiramisu/base.py +++ b/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) diff --git a/tests/flattener_dicos/10leadership_leader_hidden/00-base.xml b/tests/dictionaries/10leadership_leader_hidden/00-base.xml similarity index 100% rename from tests/flattener_dicos/10leadership_leader_hidden/00-base.xml rename to tests/dictionaries/10leadership_leader_hidden/00-base.xml diff --git a/tests/flattener_dicos/10leadership_leader_hidden/__init__.py b/tests/dictionaries/10leadership_leader_hidden/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_leader_hidden/__init__.py rename to tests/dictionaries/10leadership_leader_hidden/__init__.py diff --git a/tests/flattener_dicos/10leadership_leader_hidden/makedict/base.json b/tests/dictionaries/10leadership_leader_hidden/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10leadership_leader_hidden/makedict/base.json rename to tests/dictionaries/10leadership_leader_hidden/makedict/base.json diff --git a/tests/flattener_dicos/10leadership_leader_hidden/tiramisu/__init__.py b/tests/dictionaries/10leadership_leader_hidden/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_leader_hidden/tiramisu/__init__.py rename to tests/dictionaries/10leadership_leader_hidden/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10leadership_leader_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py similarity index 90% rename from tests/flattener_dicos/10leadership_leader_hidden/tiramisu/base.py rename to tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py index 2ffcd10a..c6d13baf 100644 --- a/tests/flattener_dicos/10leadership_leader_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'mandatory'}), name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")}))) diff --git a/tests/flattener_dicos/10leadership_leader_hidden_if_in/00-base.xml b/tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml similarity index 100% rename from tests/flattener_dicos/10leadership_leader_hidden_if_in/00-base.xml rename to tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml diff --git a/tests/flattener_dicos/10leadership_leader_hidden_if_in/__init__.py b/tests/dictionaries/10leadership_leader_hidden_if_in/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_leader_hidden_if_in/__init__.py rename to tests/dictionaries/10leadership_leader_hidden_if_in/__init__.py diff --git a/tests/flattener_dicos/10leadership_leader_hidden_if_in/makedict/base.json b/tests/dictionaries/10leadership_leader_hidden_if_in/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10leadership_leader_hidden_if_in/makedict/base.json rename to tests/dictionaries/10leadership_leader_hidden_if_in/makedict/base.json diff --git a/tests/flattener_dicos/10leadership_leader_hidden_if_in/tiramisu/__init__.py b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_leader_hidden_if_in/tiramisu/__init__.py rename to tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10leadership_leader_hidden_if_in/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py similarity index 93% rename from tests/flattener_dicos/10leadership_leader_hidden_if_in/tiramisu/base.py rename to tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py index aad34385..db1659cc 100644 --- a/tests/flattener_dicos/10leadership_leader_hidden_if_in/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_6 = StrOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))}), name='leader', doc='leader', multi=True) diff --git a/tests/flattener_dicos/10leadership_leadermandatory/00-base.xml b/tests/dictionaries/10leadership_leadermandatory/00-base.xml similarity index 100% rename from tests/flattener_dicos/10leadership_leadermandatory/00-base.xml rename to tests/dictionaries/10leadership_leadermandatory/00-base.xml diff --git a/tests/flattener_dicos/10leadership_leadermandatory/__init__.py b/tests/dictionaries/10leadership_leadermandatory/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_leadermandatory/__init__.py rename to tests/dictionaries/10leadership_leadermandatory/__init__.py diff --git a/tests/flattener_dicos/10leadership_leadermandatory/makedict/base.json b/tests/dictionaries/10leadership_leadermandatory/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10leadership_leadermandatory/makedict/base.json rename to tests/dictionaries/10leadership_leadermandatory/makedict/base.json diff --git a/tests/flattener_dicos/10leadership_leadermandatory/tiramisu/__init__.py b/tests/dictionaries/10leadership_leadermandatory/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_leadermandatory/tiramisu/__init__.py rename to tests/dictionaries/10leadership_leadermandatory/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10leadership_leadermandatory/tiramisu/base.py b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/10leadership_leadermandatory/tiramisu/base.py rename to tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py index 9aecedf3..fdc74c7e 100644 --- a/tests/flattener_dicos/10leadership_leadermandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True) option_6 = StrOption(properties=frozenset({'basic', 'mandatory'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) diff --git a/tests/flattener_dicos/10leadership_mandatory/00-base.xml b/tests/dictionaries/10leadership_mandatory/00-base.xml similarity index 100% rename from tests/flattener_dicos/10leadership_mandatory/00-base.xml rename to tests/dictionaries/10leadership_mandatory/00-base.xml diff --git a/tests/flattener_dicos/10leadership_mandatory/__init__.py b/tests/dictionaries/10leadership_mandatory/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_mandatory/__init__.py rename to tests/dictionaries/10leadership_mandatory/__init__.py diff --git a/tests/flattener_dicos/10leadership_mandatory/makedict/base.json b/tests/dictionaries/10leadership_mandatory/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10leadership_mandatory/makedict/base.json rename to tests/dictionaries/10leadership_mandatory/makedict/base.json diff --git a/tests/flattener_dicos/10leadership_mandatory/tiramisu/__init__.py b/tests/dictionaries/10leadership_mandatory/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_mandatory/tiramisu/__init__.py rename to tests/dictionaries/10leadership_mandatory/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10leadership_mandatory/tiramisu/base.py b/tests/dictionaries/10leadership_mandatory/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/10leadership_mandatory/tiramisu/base.py rename to tests/dictionaries/10leadership_mandatory/tiramisu/base.py index 74d1555f..00f0730b 100644 --- a/tests/flattener_dicos/10leadership_mandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_mandatory/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) diff --git a/tests/flattener_dicos/10leadership_mandatoryfollower/00-base.xml b/tests/dictionaries/10leadership_mandatoryfollower/00-base.xml similarity index 100% rename from tests/flattener_dicos/10leadership_mandatoryfollower/00-base.xml rename to tests/dictionaries/10leadership_mandatoryfollower/00-base.xml diff --git a/tests/flattener_dicos/10leadership_mandatoryfollower/__init__.py b/tests/dictionaries/10leadership_mandatoryfollower/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_mandatoryfollower/__init__.py rename to tests/dictionaries/10leadership_mandatoryfollower/__init__.py diff --git a/tests/flattener_dicos/10leadership_mandatoryfollower/makedict/base.json b/tests/dictionaries/10leadership_mandatoryfollower/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10leadership_mandatoryfollower/makedict/base.json rename to tests/dictionaries/10leadership_mandatoryfollower/makedict/base.json diff --git a/tests/flattener_dicos/10leadership_mandatoryfollower/tiramisu/__init__.py b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_mandatoryfollower/tiramisu/__init__.py rename to tests/dictionaries/10leadership_mandatoryfollower/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10leadership_mandatoryfollower/tiramisu/base.py b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py similarity index 87% rename from tests/flattener_dicos/10leadership_mandatoryfollower/tiramisu/base.py rename to tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py index 36f159e1..f1d54453 100644 --- a/tests/flattener_dicos/10leadership_mandatoryfollower/tiramisu/base.py +++ b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_5 = NetmaskOption(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', multi=True) option_6 = NetworkOption(properties=frozenset({'mandatory', 'normal'}), name='nut_monitor_host', doc='Adresse IP du réseau de l\'esclave', multi=True) diff --git a/tests/flattener_dicos/10leadership_multi/00-base.xml b/tests/dictionaries/10leadership_multi/00-base.xml similarity index 100% rename from tests/flattener_dicos/10leadership_multi/00-base.xml rename to tests/dictionaries/10leadership_multi/00-base.xml diff --git a/tests/flattener_dicos/10leadership_multi/__init__.py b/tests/dictionaries/10leadership_multi/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_multi/__init__.py rename to tests/dictionaries/10leadership_multi/__init__.py diff --git a/tests/flattener_dicos/10leadership_multi/makedict/base.json b/tests/dictionaries/10leadership_multi/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10leadership_multi/makedict/base.json rename to tests/dictionaries/10leadership_multi/makedict/base.json diff --git a/tests/flattener_dicos/10leadership_multi/tiramisu/__init__.py b/tests/dictionaries/10leadership_multi/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10leadership_multi/tiramisu/__init__.py rename to tests/dictionaries/10leadership_multi/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10leadership_multi/tiramisu/base.py b/tests/dictionaries/10leadership_multi/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/10leadership_multi/tiramisu/base.py rename to tests/dictionaries/10leadership_multi/tiramisu/base.py index 7e92cabd..84a460e1 100644 --- a/tests/flattener_dicos/10leadership_multi/tiramisu/base.py +++ b/tests/dictionaries/10leadership_multi/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True) diff --git a/tests/flattener_dicos/10load_disabled_if_in/00-base.xml b/tests/dictionaries/10load_disabled_if_in/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_in/00-base.xml rename to tests/dictionaries/10load_disabled_if_in/00-base.xml diff --git a/tests/flattener_dicos/10load_disabled_if_in/__init__.py b/tests/dictionaries/10load_disabled_if_in/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_in/__init__.py rename to tests/dictionaries/10load_disabled_if_in/__init__.py diff --git a/tests/flattener_dicos/10load_disabled_if_in/makedict/base.json b/tests/dictionaries/10load_disabled_if_in/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_in/makedict/base.json rename to tests/dictionaries/10load_disabled_if_in/makedict/base.json diff --git a/tests/flattener_dicos/10load_disabled_if_in/tiramisu/__init__.py b/tests/dictionaries/10load_disabled_if_in/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_in/tiramisu/__init__.py rename to tests/dictionaries/10load_disabled_if_in/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_disabled_if_in/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/10load_disabled_if_in/tiramisu/base.py rename to tests/dictionaries/10load_disabled_if_in/tiramisu/base.py index fdb9d2fe..e7daeb0c 100644 --- a/tests/flattener_dicos/10load_disabled_if_in/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10load_disabled_if_in_none/00-base.xml b/tests/dictionaries/10load_disabled_if_in_none/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_in_none/00-base.xml rename to tests/dictionaries/10load_disabled_if_in_none/00-base.xml diff --git a/tests/flattener_dicos/10load_disabled_if_in_none/__init__.py b/tests/dictionaries/10load_disabled_if_in_none/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_in_none/__init__.py rename to tests/dictionaries/10load_disabled_if_in_none/__init__.py diff --git a/tests/flattener_dicos/10load_disabled_if_in_none/makedict/base.json b/tests/dictionaries/10load_disabled_if_in_none/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_in_none/makedict/base.json rename to tests/dictionaries/10load_disabled_if_in_none/makedict/base.json diff --git a/tests/flattener_dicos/10load_disabled_if_in_none/tiramisu/__init__.py b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_in_none/tiramisu/__init__.py rename to tests/dictionaries/10load_disabled_if_in_none/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_disabled_if_in_none/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/10load_disabled_if_in_none/tiramisu/base.py rename to tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py index 7b7a3de4..c5a6d70c 100644 --- a/tests/flattener_dicos/10load_disabled_if_in_none/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('None')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('None')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10load_disabled_if_inaccent_family/00-base.xml b/tests/dictionaries/10load_disabled_if_inaccent_family/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_inaccent_family/00-base.xml rename to tests/dictionaries/10load_disabled_if_inaccent_family/00-base.xml diff --git a/tests/flattener_dicos/10load_disabled_if_inaccent_family/__init__.py b/tests/dictionaries/10load_disabled_if_inaccent_family/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_inaccent_family/__init__.py rename to tests/dictionaries/10load_disabled_if_inaccent_family/__init__.py diff --git a/tests/flattener_dicos/10load_disabled_if_inaccent_family/makedict/base.json b/tests/dictionaries/10load_disabled_if_inaccent_family/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_inaccent_family/makedict/base.json rename to tests/dictionaries/10load_disabled_if_inaccent_family/makedict/base.json diff --git a/tests/flattener_dicos/10load_disabled_if_inaccent_family/tiramisu/__init__.py b/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_inaccent_family/tiramisu/__init__.py rename to tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_disabled_if_inaccent_family/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/10load_disabled_if_inaccent_family/tiramisu/base.py rename to tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py index 4d2654eb..e546c4e3 100644 --- a/tests/flattener_dicos/10load_disabled_if_inaccent_family/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10load_disabled_if_not_in_fallback/00-base.xml b/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_not_in_fallback/00-base.xml rename to tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml diff --git a/tests/flattener_dicos/10load_disabled_if_not_in_fallback/__init__.py b/tests/dictionaries/10load_disabled_if_not_in_fallback/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_not_in_fallback/__init__.py rename to tests/dictionaries/10load_disabled_if_not_in_fallback/__init__.py diff --git a/tests/flattener_dicos/10load_disabled_if_not_in_fallback/makedict/base.json b/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_not_in_fallback/makedict/base.json rename to tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/base.json diff --git a/tests/flattener_dicos/10load_disabled_if_not_in_fallback/tiramisu/__init__.py b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_not_in_fallback/tiramisu/__init__.py rename to tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_disabled_if_not_in_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/10load_disabled_if_not_in_fallback/tiramisu/base.py rename to tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py index 1cb4f992..49562737 100644 --- a/tests/flattener_dicos/10load_disabled_if_not_in_fallback/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10load_disabled_if_not_in_fallback_force/00-base.xml b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_not_in_fallback_force/00-base.xml rename to tests/dictionaries/10load_disabled_if_not_in_fallback_force/00-base.xml diff --git a/tests/flattener_dicos/10load_disabled_if_not_in_fallback_force/__init__.py b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_not_in_fallback_force/__init__.py rename to tests/dictionaries/10load_disabled_if_not_in_fallback_force/__init__.py diff --git a/tests/flattener_dicos/10load_disabled_if_not_in_fallback_force/makedict/base.json b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_not_in_fallback_force/makedict/base.json rename to tests/dictionaries/10load_disabled_if_not_in_fallback_force/makedict/base.json diff --git a/tests/flattener_dicos/10load_disabled_if_not_in_fallback_force/tiramisu/__init__.py b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabled_if_not_in_fallback_force/tiramisu/__init__.py rename to tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_disabled_if_not_in_fallback_force/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/10load_disabled_if_not_in_fallback_force/tiramisu/base.py rename to tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py index 1cb4f992..49562737 100644 --- a/tests/flattener_dicos/10load_disabled_if_not_in_fallback_force/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10load_disabledifin_fallback/00-base.xml b/tests/dictionaries/10load_disabledifin_fallback/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_disabledifin_fallback/00-base.xml rename to tests/dictionaries/10load_disabledifin_fallback/00-base.xml diff --git a/tests/flattener_dicos/10load_disabledifin_fallback/__init__.py b/tests/dictionaries/10load_disabledifin_fallback/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabledifin_fallback/__init__.py rename to tests/dictionaries/10load_disabledifin_fallback/__init__.py diff --git a/tests/flattener_dicos/10load_disabledifin_fallback/makedict/base.json b/tests/dictionaries/10load_disabledifin_fallback/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_disabledifin_fallback/makedict/base.json rename to tests/dictionaries/10load_disabledifin_fallback/makedict/base.json diff --git a/tests/flattener_dicos/10load_disabledifin_fallback/tiramisu/__init__.py b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabledifin_fallback/tiramisu/__init__.py rename to tests/dictionaries/10load_disabledifin_fallback/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_disabledifin_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py similarity index 87% rename from tests/flattener_dicos/10load_disabledifin_fallback/tiramisu/base.py rename to tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py index 5f6bd6ad..d02fe4ed 100644 --- a/tests/flattener_dicos/10load_disabledifin_fallback/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'disabled', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10load_disabledifin_fallback_force/00-base.xml b/tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_disabledifin_fallback_force/00-base.xml rename to tests/dictionaries/10load_disabledifin_fallback_force/00-base.xml diff --git a/tests/flattener_dicos/10load_disabledifin_fallback_force/__init__.py b/tests/dictionaries/10load_disabledifin_fallback_force/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabledifin_fallback_force/__init__.py rename to tests/dictionaries/10load_disabledifin_fallback_force/__init__.py diff --git a/tests/flattener_dicos/10load_disabledifin_fallback_force/makedict/base.json b/tests/dictionaries/10load_disabledifin_fallback_force/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_disabledifin_fallback_force/makedict/base.json rename to tests/dictionaries/10load_disabledifin_fallback_force/makedict/base.json diff --git a/tests/flattener_dicos/10load_disabledifin_fallback_force/tiramisu/__init__.py b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabledifin_fallback_force/tiramisu/__init__.py rename to tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_disabledifin_whithouttype/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/10load_disabledifin_whithouttype/tiramisu/base.py rename to tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py index 54bc2716..199de4ae 100644 --- a/tests/flattener_dicos/10load_disabledifin_whithouttype/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10load_disabledifin_whithouttype/00-base.xml b/tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_disabledifin_whithouttype/00-base.xml rename to tests/dictionaries/10load_disabledifin_whithouttype/00-base.xml diff --git a/tests/flattener_dicos/10load_disabledifin_whithouttype/__init__.py b/tests/dictionaries/10load_disabledifin_whithouttype/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabledifin_whithouttype/__init__.py rename to tests/dictionaries/10load_disabledifin_whithouttype/__init__.py diff --git a/tests/flattener_dicos/10load_disabledifin_whithouttype/makedict/base.json b/tests/dictionaries/10load_disabledifin_whithouttype/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_disabledifin_whithouttype/makedict/base.json rename to tests/dictionaries/10load_disabledifin_whithouttype/makedict/base.json diff --git a/tests/flattener_dicos/10load_disabledifin_whithouttype/tiramisu/__init__.py b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_disabledifin_whithouttype/tiramisu/__init__.py rename to tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_disabledifin_fallback_force/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/10load_disabledifin_fallback_force/tiramisu/base.py rename to tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py index 54bc2716..199de4ae 100644 --- a/tests/flattener_dicos/10load_disabledifin_fallback_force/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10load_emptyvalue/00-base.xml b/tests/dictionaries/10load_emptyvalue/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_emptyvalue/00-base.xml rename to tests/dictionaries/10load_emptyvalue/00-base.xml diff --git a/tests/flattener_dicos/10load_emptyvalue/__init__.py b/tests/dictionaries/10load_emptyvalue/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_emptyvalue/__init__.py rename to tests/dictionaries/10load_emptyvalue/__init__.py diff --git a/tests/flattener_dicos/10load_emptyvalue/makedict/base.json b/tests/dictionaries/10load_emptyvalue/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_emptyvalue/makedict/base.json rename to tests/dictionaries/10load_emptyvalue/makedict/base.json diff --git a/tests/flattener_dicos/10load_emptyvalue/tiramisu/__init__.py b/tests/dictionaries/10load_emptyvalue/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_emptyvalue/tiramisu/__init__.py rename to tests/dictionaries/10load_emptyvalue/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_emptyvalue/tiramisu/base.py b/tests/dictionaries/10load_emptyvalue/tiramisu/base.py similarity index 80% rename from tests/flattener_dicos/10load_emptyvalue/tiramisu/base.py rename to tests/dictionaries/10load_emptyvalue/tiramisu/base.py index 5462f47e..b817fcbc 100644 --- a/tests/flattener_dicos/10load_emptyvalue/tiramisu/base.py +++ b/tests/dictionaries/10load_emptyvalue/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = StrOption(properties=frozenset({'normal'}), name='mode_conteneur_actif', doc='No change', multi=False) option_4 = StrOption(properties=frozenset({'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/10load_frozenifin/00-base.xml b/tests/dictionaries/10load_frozenifin/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_frozenifin/00-base.xml rename to tests/dictionaries/10load_frozenifin/00-base.xml diff --git a/tests/flattener_dicos/10load_frozenifin/__init__.py b/tests/dictionaries/10load_frozenifin/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_frozenifin/__init__.py rename to tests/dictionaries/10load_frozenifin/__init__.py diff --git a/tests/flattener_dicos/10load_frozenifin/makedict/base.json b/tests/dictionaries/10load_frozenifin/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_frozenifin/makedict/base.json rename to tests/dictionaries/10load_frozenifin/makedict/base.json diff --git a/tests/flattener_dicos/10load_frozenifin/tiramisu/__init__.py b/tests/dictionaries/10load_frozenifin/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_frozenifin/tiramisu/__init__.py rename to tests/dictionaries/10load_frozenifin/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_frozenifin/tiramisu/base.py b/tests/dictionaries/10load_frozenifin/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/10load_frozenifin/tiramisu/base.py rename to tests/dictionaries/10load_frozenifin/tiramisu/base.py index 1713665b..4df1f359 100644 --- a/tests/flattener_dicos/10load_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10load_frozenifin_auto/00-base.xml b/tests/dictionaries/10load_frozenifin_auto/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_frozenifin_auto/00-base.xml rename to tests/dictionaries/10load_frozenifin_auto/00-base.xml diff --git a/tests/flattener_dicos/10load_frozenifin_auto/__init__.py b/tests/dictionaries/10load_frozenifin_auto/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_frozenifin_auto/__init__.py rename to tests/dictionaries/10load_frozenifin_auto/__init__.py diff --git a/tests/flattener_dicos/10load_frozenifin_auto/makedict/base.json b/tests/dictionaries/10load_frozenifin_auto/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_frozenifin_auto/makedict/base.json rename to tests/dictionaries/10load_frozenifin_auto/makedict/base.json diff --git a/tests/flattener_dicos/10load_frozenifin_auto/tiramisu/__init__.py b/tests/dictionaries/10load_frozenifin_auto/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_frozenifin_auto/tiramisu/__init__.py rename to tests/dictionaries/10load_frozenifin_auto/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_frozenifin_auto/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/10load_frozenifin_auto/tiramisu/base.py rename to tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py index 2bef0647..bdd4bd8c 100644 --- a/tests/flattener_dicos/10load_frozenifin_auto/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("non")), kwargs={})), values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10load_frozenifin_multiparam/00-base.xml b/tests/dictionaries/10load_frozenifin_multiparam/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_frozenifin_multiparam/00-base.xml rename to tests/dictionaries/10load_frozenifin_multiparam/00-base.xml diff --git a/tests/flattener_dicos/10load_frozenifin_multiparam/__init__.py b/tests/dictionaries/10load_frozenifin_multiparam/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_frozenifin_multiparam/__init__.py rename to tests/dictionaries/10load_frozenifin_multiparam/__init__.py diff --git a/tests/flattener_dicos/10load_frozenifin_multiparam/makedict/base.json b/tests/dictionaries/10load_frozenifin_multiparam/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_frozenifin_multiparam/makedict/base.json rename to tests/dictionaries/10load_frozenifin_multiparam/makedict/base.json diff --git a/tests/flattener_dicos/10load_frozenifin_multiparam/tiramisu/__init__.py b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_frozenifin_multiparam/tiramisu/__init__.py rename to tests/dictionaries/10load_frozenifin_multiparam/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_frozenifin_multiparam/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py similarity index 95% rename from tests/flattener_dicos/10load_frozenifin_multiparam/tiramisu/base.py rename to tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py index e65e2035..ee740c1b 100644 --- a/tests/flattener_dicos/10load_frozenifin_multiparam/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='tous', values=('tous', 'authentifié', 'aucun')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10load_frozenifin_noexist/00-base.xml b/tests/dictionaries/10load_frozenifin_noexist/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_frozenifin_noexist/00-base.xml rename to tests/dictionaries/10load_frozenifin_noexist/00-base.xml diff --git a/tests/flattener_dicos/10load_frozenifin_noexist/__init__.py b/tests/dictionaries/10load_frozenifin_noexist/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_frozenifin_noexist/__init__.py rename to tests/dictionaries/10load_frozenifin_noexist/__init__.py diff --git a/tests/flattener_dicos/10load_frozenifin_noexist/makedict/base.json b/tests/dictionaries/10load_frozenifin_noexist/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_frozenifin_noexist/makedict/base.json rename to tests/dictionaries/10load_frozenifin_noexist/makedict/base.json diff --git a/tests/flattener_dicos/10load_frozenifin_noexist/tiramisu/__init__.py b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_frozenifin_noexist/tiramisu/__init__.py rename to tests/dictionaries/10load_frozenifin_noexist/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_frozenifin_noexist/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py similarity index 87% rename from tests/flattener_dicos/10load_frozenifin_noexist/tiramisu/base.py rename to tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py index 377968df..6480984e 100644 --- a/tests/flattener_dicos/10load_frozenifin_noexist/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='tous', values=('tous', 'authentifié', 'aucun')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10load_hidden_if_family/00-base.xml b/tests/dictionaries/10load_hidden_if_family/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_hidden_if_family/00-base.xml rename to tests/dictionaries/10load_hidden_if_family/00-base.xml diff --git a/tests/flattener_dicos/10load_hidden_if_family/__init__.py b/tests/dictionaries/10load_hidden_if_family/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_hidden_if_family/__init__.py rename to tests/dictionaries/10load_hidden_if_family/__init__.py diff --git a/tests/flattener_dicos/10load_hidden_if_family/makedict/base.json b/tests/dictionaries/10load_hidden_if_family/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_hidden_if_family/makedict/base.json rename to tests/dictionaries/10load_hidden_if_family/makedict/base.json diff --git a/tests/flattener_dicos/10load_hidden_if_family/tiramisu/__init__.py b/tests/dictionaries/10load_hidden_if_family/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_hidden_if_family/tiramisu/__init__.py rename to tests/dictionaries/10load_hidden_if_family/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_hidden_if_family/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py similarity index 94% rename from tests/flattener_dicos/10load_hidden_if_family/tiramisu/base.py rename to tests/dictionaries/10load_hidden_if_family/tiramisu/base.py index e85126c1..4ba2c60c 100644 --- a/tests/flattener_dicos/10load_hidden_if_family/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/10load_leadership/00-base.xml b/tests/dictionaries/10load_leadership/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_leadership/00-base.xml rename to tests/dictionaries/10load_leadership/00-base.xml diff --git a/tests/flattener_dicos/10load_leadership/__init__.py b/tests/dictionaries/10load_leadership/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership/__init__.py rename to tests/dictionaries/10load_leadership/__init__.py diff --git a/tests/flattener_dicos/10load_leadership/makedict/base.json b/tests/dictionaries/10load_leadership/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_leadership/makedict/base.json rename to tests/dictionaries/10load_leadership/makedict/base.json diff --git a/tests/flattener_dicos/10load_leadership/tiramisu/__init__.py b/tests/dictionaries/10load_leadership/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership/tiramisu/__init__.py rename to tests/dictionaries/10load_leadership/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_leadership/tiramisu/base.py b/tests/dictionaries/10load_leadership/tiramisu/base.py similarity index 90% rename from tests/flattener_dicos/10load_leadership/tiramisu/base.py rename to tests/dictionaries/10load_leadership/tiramisu/base.py index 3e65f494..e76a39da 100644 --- a/tests/flattener_dicos/10load_leadership/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True) diff --git a/tests/flattener_dicos/10load_leadership_default_multi/00-base.xml b/tests/dictionaries/10load_leadership_default_multi/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_leadership_default_multi/00-base.xml rename to tests/dictionaries/10load_leadership_default_multi/00-base.xml diff --git a/tests/flattener_dicos/10load_leadership_default_multi/__init__.py b/tests/dictionaries/10load_leadership_default_multi/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership_default_multi/__init__.py rename to tests/dictionaries/10load_leadership_default_multi/__init__.py diff --git a/tests/flattener_dicos/10load_leadership_default_multi/makedict/base.json b/tests/dictionaries/10load_leadership_default_multi/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_leadership_default_multi/makedict/base.json rename to tests/dictionaries/10load_leadership_default_multi/makedict/base.json diff --git a/tests/flattener_dicos/10load_leadership_default_multi/tiramisu/__init__.py b/tests/dictionaries/10load_leadership_default_multi/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership_default_multi/tiramisu/__init__.py rename to tests/dictionaries/10load_leadership_default_multi/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_leadership_default_multi/tiramisu/base.py b/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py similarity index 87% rename from tests/flattener_dicos/10load_leadership_default_multi/tiramisu/base.py rename to tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py index a5e5256c..5e61121e 100644 --- a/tests/flattener_dicos/10load_leadership_default_multi/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='leader', multi=True, default=['non'], default_multi='non', values=('oui', 'non')) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default_multi='value') diff --git a/tests/flattener_dicos/10load_leadership_default_submulti/00-base.xml b/tests/dictionaries/10load_leadership_default_submulti/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_leadership_default_submulti/00-base.xml rename to tests/dictionaries/10load_leadership_default_submulti/00-base.xml diff --git a/tests/flattener_dicos/10load_leadership_default_submulti/__init__.py b/tests/dictionaries/10load_leadership_default_submulti/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership_default_submulti/__init__.py rename to tests/dictionaries/10load_leadership_default_submulti/__init__.py diff --git a/tests/flattener_dicos/10load_leadership_default_submulti/makedict/base.json b/tests/dictionaries/10load_leadership_default_submulti/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_leadership_default_submulti/makedict/base.json rename to tests/dictionaries/10load_leadership_default_submulti/makedict/base.json diff --git a/tests/flattener_dicos/10load_leadership_default_submulti/tiramisu/__init__.py b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership_default_submulti/tiramisu/__init__.py rename to tests/dictionaries/10load_leadership_default_submulti/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_leadership_default_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py similarity index 88% rename from tests/flattener_dicos/10load_leadership_default_submulti/tiramisu/base.py rename to tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py index 431bc97b..46b6c316 100644 --- a/tests/flattener_dicos/10load_leadership_default_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='leader', multi=True, default=['non'], default_multi='non', values=('oui', 'non')) option_5 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True, default=['leader']) option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=submulti, default_multi=['value']) diff --git a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/00-base.xml b/tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_leadership_defaultmulti_leader/00-base.xml rename to tests/dictionaries/10load_leadership_defaultmulti_leader/00-base.xml diff --git a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/__init__.py b/tests/dictionaries/10load_leadership_defaultmulti_leader/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership_defaultmulti_leader/__init__.py rename to tests/dictionaries/10load_leadership_defaultmulti_leader/__init__.py diff --git a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/makedict/base.json b/tests/dictionaries/10load_leadership_defaultmulti_leader/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_leadership_defaultmulti_leader/makedict/base.json rename to tests/dictionaries/10load_leadership_defaultmulti_leader/makedict/base.json diff --git a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/tiramisu/__init__.py b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership_defaultmulti_leader/tiramisu/__init__.py rename to tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/tiramisu/base.py b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py similarity index 87% rename from tests/flattener_dicos/10load_leadership_defaultmulti_leader/tiramisu/base.py rename to tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py index 5b774de0..118ccabd 100644 --- a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='leader', multi=True, default=['non'], default_multi='non', values=('oui', 'non')) option_5 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True, default=['value']) option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True) diff --git a/tests/flattener_dicos/10load_leadership_description/00-base.xml b/tests/dictionaries/10load_leadership_description/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_leadership_description/00-base.xml rename to tests/dictionaries/10load_leadership_description/00-base.xml diff --git a/tests/flattener_dicos/10load_leadership_description/__init__.py b/tests/dictionaries/10load_leadership_description/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership_description/__init__.py rename to tests/dictionaries/10load_leadership_description/__init__.py diff --git a/tests/flattener_dicos/10load_leadership_description/makedict/base.json b/tests/dictionaries/10load_leadership_description/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_leadership_description/makedict/base.json rename to tests/dictionaries/10load_leadership_description/makedict/base.json diff --git a/tests/flattener_dicos/10load_leadership_description/tiramisu/__init__.py b/tests/dictionaries/10load_leadership_description/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership_description/tiramisu/__init__.py rename to tests/dictionaries/10load_leadership_description/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_leadership_description/tiramisu/base.py b/tests/dictionaries/10load_leadership_description/tiramisu/base.py similarity index 90% rename from tests/flattener_dicos/10load_leadership_description/tiramisu/base.py rename to tests/dictionaries/10load_leadership_description/tiramisu/base.py index a7a108bb..14f289ec 100644 --- a/tests/flattener_dicos/10load_leadership_description/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_description/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True) diff --git a/tests/flattener_dicos/10load_leadership_normalize_family/00-base.xml b/tests/dictionaries/10load_leadership_normalize_family/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_leadership_normalize_family/00-base.xml rename to tests/dictionaries/10load_leadership_normalize_family/00-base.xml diff --git a/tests/flattener_dicos/10load_leadership_normalize_family/01-base.xml b/tests/dictionaries/10load_leadership_normalize_family/01-base.xml similarity index 100% rename from tests/flattener_dicos/10load_leadership_normalize_family/01-base.xml rename to tests/dictionaries/10load_leadership_normalize_family/01-base.xml diff --git a/tests/flattener_dicos/10load_leadership_normalize_family/__init__.py b/tests/dictionaries/10load_leadership_normalize_family/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership_normalize_family/__init__.py rename to tests/dictionaries/10load_leadership_normalize_family/__init__.py diff --git a/tests/flattener_dicos/10load_leadership_normalize_family/makedict/base.json b/tests/dictionaries/10load_leadership_normalize_family/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_leadership_normalize_family/makedict/base.json rename to tests/dictionaries/10load_leadership_normalize_family/makedict/base.json diff --git a/tests/flattener_dicos/10load_leadership_normalize_family/tiramisu/__init__.py b/tests/dictionaries/10load_leadership_normalize_family/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership_normalize_family/tiramisu/__init__.py rename to tests/dictionaries/10load_leadership_normalize_family/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_leadership_normalize_family/tiramisu/base.py b/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py similarity index 88% rename from tests/flattener_dicos/10load_leadership_normalize_family/tiramisu/base.py rename to tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py index 75026f13..5de69a55 100644 --- a/tests/flattener_dicos/10load_leadership_normalize_family/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True) diff --git a/tests/flattener_dicos/10load_leadership_submulti/00-base.xml b/tests/dictionaries/10load_leadership_submulti/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_leadership_submulti/00-base.xml rename to tests/dictionaries/10load_leadership_submulti/00-base.xml diff --git a/tests/flattener_dicos/10load_leadership_submulti/__init__.py b/tests/dictionaries/10load_leadership_submulti/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership_submulti/__init__.py rename to tests/dictionaries/10load_leadership_submulti/__init__.py diff --git a/tests/flattener_dicos/10load_leadership_submulti/makedict/base.json b/tests/dictionaries/10load_leadership_submulti/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_leadership_submulti/makedict/base.json rename to tests/dictionaries/10load_leadership_submulti/makedict/base.json diff --git a/tests/flattener_dicos/10load_leadership_submulti/tiramisu/__init__.py b/tests/dictionaries/10load_leadership_submulti/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_leadership_submulti/tiramisu/__init__.py rename to tests/dictionaries/10load_leadership_submulti/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_leadership_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py similarity index 90% rename from tests/flattener_dicos/10load_leadership_submulti/tiramisu/base.py rename to tests/dictionaries/10load_leadership_submulti/tiramisu/base.py index 198cf443..6e718c9e 100644 --- a/tests/flattener_dicos/10load_leadership_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True) diff --git a/tests/flattener_dicos/10load_mandatoryifin/00-base.xml b/tests/dictionaries/10load_mandatoryifin/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_mandatoryifin/00-base.xml rename to tests/dictionaries/10load_mandatoryifin/00-base.xml diff --git a/tests/flattener_dicos/10load_mandatoryifin/__init__.py b/tests/dictionaries/10load_mandatoryifin/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_mandatoryifin/__init__.py rename to tests/dictionaries/10load_mandatoryifin/__init__.py diff --git a/tests/flattener_dicos/10load_mandatoryifin/makedict/base.json b/tests/dictionaries/10load_mandatoryifin/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_mandatoryifin/makedict/base.json rename to tests/dictionaries/10load_mandatoryifin/makedict/base.json diff --git a/tests/flattener_dicos/10load_mandatoryifin/tiramisu/__init__.py b/tests/dictionaries/10load_mandatoryifin/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_mandatoryifin/tiramisu/__init__.py rename to tests/dictionaries/10load_mandatoryifin/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_mandatoryifin/tiramisu/base.py b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py similarity index 88% rename from tests/flattener_dicos/10load_mandatoryifin/tiramisu/base.py rename to tests/dictionaries/10load_mandatoryifin/tiramisu/base.py index 88682c2d..171b5779 100644 --- a/tests/flattener_dicos/10load_mandatoryifin/tiramisu/base.py +++ b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') option_5 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') diff --git a/tests/flattener_dicos/10load_multivalue/00-base.xml b/tests/dictionaries/10load_multivalue/00-base.xml similarity index 100% rename from tests/flattener_dicos/10load_multivalue/00-base.xml rename to tests/dictionaries/10load_multivalue/00-base.xml diff --git a/tests/flattener_dicos/10load_multivalue/__init__.py b/tests/dictionaries/10load_multivalue/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_multivalue/__init__.py rename to tests/dictionaries/10load_multivalue/__init__.py diff --git a/tests/flattener_dicos/10load_multivalue/makedict/base.json b/tests/dictionaries/10load_multivalue/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10load_multivalue/makedict/base.json rename to tests/dictionaries/10load_multivalue/makedict/base.json diff --git a/tests/flattener_dicos/10load_multivalue/tiramisu/__init__.py b/tests/dictionaries/10load_multivalue/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10load_multivalue/tiramisu/__init__.py rename to tests/dictionaries/10load_multivalue/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10load_multivalue/tiramisu/base.py b/tests/dictionaries/10load_multivalue/tiramisu/base.py similarity index 80% rename from tests/flattener_dicos/10load_multivalue/tiramisu/base.py rename to tests/dictionaries/10load_multivalue/tiramisu/base.py index 7398ead7..64f2ab6f 100644 --- a/tests/flattener_dicos/10load_multivalue/tiramisu/base.py +++ b/tests/dictionaries/10load_multivalue/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=True, default=['non', 'oui'], default_multi='oui', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/10valid_enum_accent/00-base.xml b/tests/dictionaries/10valid_enum_accent/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_accent/00-base.xml rename to tests/dictionaries/10valid_enum_accent/00-base.xml diff --git a/tests/flattener_dicos/10valid_enum_accent/__init__.py b/tests/dictionaries/10valid_enum_accent/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_accent/__init__.py rename to tests/dictionaries/10valid_enum_accent/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_accent/makedict/base.json b/tests/dictionaries/10valid_enum_accent/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10valid_enum_accent/makedict/base.json rename to tests/dictionaries/10valid_enum_accent/makedict/base.json diff --git a/tests/flattener_dicos/10valid_enum_accent/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_accent/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_accent/tiramisu/__init__.py rename to tests/dictionaries/10valid_enum_accent/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_accent/tiramisu/base.py b/tests/dictionaries/10valid_enum_accent/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/10valid_enum_accent/tiramisu/base.py rename to tests/dictionaries/10valid_enum_accent/tiramisu/base.py index 43eae377..3d20cc4d 100644 --- a/tests/flattener_dicos/10valid_enum_accent/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_accent/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='c', values=('a', 'b', 'c', 'é')) diff --git a/tests/flattener_dicos/10valid_enum_base/00-base.xml b/tests/dictionaries/10valid_enum_base/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_base/00-base.xml rename to tests/dictionaries/10valid_enum_base/00-base.xml diff --git a/tests/flattener_dicos/10valid_enum_base/__init__.py b/tests/dictionaries/10valid_enum_base/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_base/__init__.py rename to tests/dictionaries/10valid_enum_base/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_base/makedict/base.json b/tests/dictionaries/10valid_enum_base/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10valid_enum_base/makedict/base.json rename to tests/dictionaries/10valid_enum_base/makedict/base.json diff --git a/tests/flattener_dicos/10valid_enum_base/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_base/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_base/tiramisu/__init__.py rename to tests/dictionaries/10valid_enum_base/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_base/tiramisu/base.py b/tests/dictionaries/10valid_enum_base/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/10valid_enum_base/tiramisu/base.py rename to tests/dictionaries/10valid_enum_base/tiramisu/base.py index a8735e25..7a7b32c1 100644 --- a/tests/flattener_dicos/10valid_enum_base/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_base/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='c', values=('a', 'b', 'c')) diff --git a/tests/flattener_dicos/10valid_enum_base_redefine/00-base.xml b/tests/dictionaries/10valid_enum_base_redefine/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_base_redefine/00-base.xml rename to tests/dictionaries/10valid_enum_base_redefine/00-base.xml diff --git a/tests/flattener_dicos/10valid_enum_base_redefine/01-base.xml b/tests/dictionaries/10valid_enum_base_redefine/01-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_base_redefine/01-base.xml rename to tests/dictionaries/10valid_enum_base_redefine/01-base.xml diff --git a/tests/flattener_dicos/10valid_enum_base_redefine/__init__.py b/tests/dictionaries/10valid_enum_base_redefine/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_base_redefine/__init__.py rename to tests/dictionaries/10valid_enum_base_redefine/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_base_redefine/makedict/base.json b/tests/dictionaries/10valid_enum_base_redefine/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10valid_enum_base_redefine/makedict/base.json rename to tests/dictionaries/10valid_enum_base_redefine/makedict/base.json diff --git a/tests/flattener_dicos/10valid_enum_base_redefine/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_base_redefine/tiramisu/__init__.py rename to tests/dictionaries/10valid_enum_base_redefine/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_base_redefine/tiramisu/base.py b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py similarity index 87% rename from tests/flattener_dicos/10valid_enum_base_redefine/tiramisu/base.py rename to tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py index 19b9696c..43da0cea 100644 --- a/tests/flattener_dicos/10valid_enum_base_redefine/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar2', doc='multi', multi=False, default='c', values=('a', 'b', 'c')) diff --git a/tests/flattener_dicos/10valid_enum_eosfunc/00-base.xml b/tests/dictionaries/10valid_enum_eosfunc/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_eosfunc/00-base.xml rename to tests/dictionaries/10valid_enum_eosfunc/00-base.xml diff --git a/tests/flattener_dicos/10valid_enum_eosfunc/__init__.py b/tests/dictionaries/10valid_enum_eosfunc/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_eosfunc/__init__.py rename to tests/dictionaries/10valid_enum_eosfunc/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_eosfunc/makedict/base.json b/tests/dictionaries/10valid_enum_eosfunc/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10valid_enum_eosfunc/makedict/base.json rename to tests/dictionaries/10valid_enum_eosfunc/makedict/base.json diff --git a/tests/flattener_dicos/10valid_enum_eosfunc/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_eosfunc/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_eosfunc/tiramisu/__init__.py rename to tests/dictionaries/10valid_enum_eosfunc/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_eosfunc/tiramisu/base.py b/tests/dictionaries/10valid_enum_eosfunc/tiramisu/base.py similarity index 78% rename from tests/flattener_dicos/10valid_enum_eosfunc/tiramisu/base.py rename to tests/dictionaries/10valid_enum_eosfunc/tiramisu/base.py index 5783a3af..637aec54 100644 --- a/tests/flattener_dicos/10valid_enum_eosfunc/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_eosfunc/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/10valid_enum_leader/00-base.xml b/tests/dictionaries/10valid_enum_leader/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_leader/00-base.xml rename to tests/dictionaries/10valid_enum_leader/00-base.xml diff --git a/tests/flattener_dicos/10valid_enum_leader/__init__.py b/tests/dictionaries/10valid_enum_leader/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_leader/__init__.py rename to tests/dictionaries/10valid_enum_leader/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_leader/makedict/base.json b/tests/dictionaries/10valid_enum_leader/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10valid_enum_leader/makedict/base.json rename to tests/dictionaries/10valid_enum_leader/makedict/base.json diff --git a/tests/flattener_dicos/10valid_enum_leader/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_leader/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_leader/tiramisu/__init__.py rename to tests/dictionaries/10valid_enum_leader/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_leader/tiramisu/base.py b/tests/dictionaries/10valid_enum_leader/tiramisu/base.py similarity index 87% rename from tests/flattener_dicos/10valid_enum_leader/tiramisu/base.py rename to tests/dictionaries/10valid_enum_leader/tiramisu/base.py index 2062127e..0fccef13 100644 --- a/tests/flattener_dicos/10valid_enum_leader/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_leader/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default_multi='a', values=('a', 'b', 'c')) diff --git a/tests/flattener_dicos/10valid_enum_mandatory/00-base.xml b/tests/dictionaries/10valid_enum_mandatory/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_mandatory/00-base.xml rename to tests/dictionaries/10valid_enum_mandatory/00-base.xml diff --git a/tests/flattener_dicos/10valid_enum_mandatory/__init__.py b/tests/dictionaries/10valid_enum_mandatory/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_mandatory/__init__.py rename to tests/dictionaries/10valid_enum_mandatory/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_mandatory/makedict/base.json b/tests/dictionaries/10valid_enum_mandatory/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10valid_enum_mandatory/makedict/base.json rename to tests/dictionaries/10valid_enum_mandatory/makedict/base.json diff --git a/tests/flattener_dicos/10valid_enum_mandatory/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_mandatory/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_mandatory/tiramisu/__init__.py rename to tests/dictionaries/10valid_enum_mandatory/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_mandatory/tiramisu/base.py b/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/10valid_enum_mandatory/tiramisu/base.py rename to tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py index b417de94..4e58e1ea 100644 --- a/tests/flattener_dicos/10valid_enum_mandatory/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='a', values=('a', 'b', 'c')) diff --git a/tests/flattener_dicos/10valid_enum_multi/00-base.xml b/tests/dictionaries/10valid_enum_multi/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_multi/00-base.xml rename to tests/dictionaries/10valid_enum_multi/00-base.xml diff --git a/tests/flattener_dicos/10valid_enum_multi/__init__.py b/tests/dictionaries/10valid_enum_multi/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_multi/__init__.py rename to tests/dictionaries/10valid_enum_multi/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_multi/makedict/base.json b/tests/dictionaries/10valid_enum_multi/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10valid_enum_multi/makedict/base.json rename to tests/dictionaries/10valid_enum_multi/makedict/base.json diff --git a/tests/flattener_dicos/10valid_enum_multi/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_multi/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_multi/tiramisu/__init__.py rename to tests/dictionaries/10valid_enum_multi/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_multi/tiramisu/base.py b/tests/dictionaries/10valid_enum_multi/tiramisu/base.py similarity index 83% rename from tests/flattener_dicos/10valid_enum_multi/tiramisu/base.py rename to tests/dictionaries/10valid_enum_multi/tiramisu/base.py index 31350464..1827a4f8 100644 --- a/tests/flattener_dicos/10valid_enum_multi/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_multi/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='multi', doc='multi', multi=True, default=['a'], default_multi='a', values=('a', 'b', 'c')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/10valid_enum_none/00-base.xml b/tests/dictionaries/10valid_enum_none/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_none/00-base.xml rename to tests/dictionaries/10valid_enum_none/00-base.xml diff --git a/tests/flattener_dicos/10valid_enum_none/__init__.py b/tests/dictionaries/10valid_enum_none/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_none/__init__.py rename to tests/dictionaries/10valid_enum_none/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_none/makedict/base.json b/tests/dictionaries/10valid_enum_none/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10valid_enum_none/makedict/base.json rename to tests/dictionaries/10valid_enum_none/makedict/base.json diff --git a/tests/flattener_dicos/10valid_enum_none/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_none/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_none/tiramisu/__init__.py rename to tests/dictionaries/10valid_enum_none/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_none/tiramisu/base.py b/tests/dictionaries/10valid_enum_none/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/10valid_enum_none/tiramisu/base.py rename to tests/dictionaries/10valid_enum_none/tiramisu/base.py index 9b1ed780..cebbf612 100644 --- a/tests/flattener_dicos/10valid_enum_none/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_none/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='b', values=('a', 'b', None)) diff --git a/tests/flattener_dicos/10valid_enum_number/00-base.xml b/tests/dictionaries/10valid_enum_number/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_number/00-base.xml rename to tests/dictionaries/10valid_enum_number/00-base.xml diff --git a/tests/flattener_dicos/10valid_enum_number/__init__.py b/tests/dictionaries/10valid_enum_number/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_number/__init__.py rename to tests/dictionaries/10valid_enum_number/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_number/makedict/base.json b/tests/dictionaries/10valid_enum_number/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10valid_enum_number/makedict/base.json rename to tests/dictionaries/10valid_enum_number/makedict/base.json diff --git a/tests/flattener_dicos/10valid_enum_number/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_number/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_number/tiramisu/__init__.py rename to tests/dictionaries/10valid_enum_number/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_number/tiramisu/base.py b/tests/dictionaries/10valid_enum_number/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/10valid_enum_number/tiramisu/base.py rename to tests/dictionaries/10valid_enum_number/tiramisu/base.py index c6a42d20..be2400c6 100644 --- a/tests/flattener_dicos/10valid_enum_number/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_number/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='enumvar', multi=False, default=1, values=(1, 2, 3)) diff --git a/tests/flattener_dicos/10valid_enum_numberdefault/00-base.xml b/tests/dictionaries/10valid_enum_numberdefault/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_numberdefault/00-base.xml rename to tests/dictionaries/10valid_enum_numberdefault/00-base.xml diff --git a/tests/flattener_dicos/10valid_enum_numberdefault/__init__.py b/tests/dictionaries/10valid_enum_numberdefault/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_numberdefault/__init__.py rename to tests/dictionaries/10valid_enum_numberdefault/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_numberdefault/makedict/base.json b/tests/dictionaries/10valid_enum_numberdefault/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10valid_enum_numberdefault/makedict/base.json rename to tests/dictionaries/10valid_enum_numberdefault/makedict/base.json diff --git a/tests/flattener_dicos/10valid_enum_numberdefault/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_numberdefault/tiramisu/__init__.py rename to tests/dictionaries/10valid_enum_numberdefault/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_numberdefault/tiramisu/base.py b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/10valid_enum_numberdefault/tiramisu/base.py rename to tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py index 7c83c55f..413790a2 100644 --- a/tests/flattener_dicos/10valid_enum_numberdefault/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='enumvar', multi=False, default=3, values=(1, 2, 3)) diff --git a/tests/flattener_dicos/10valid_enum_python/00-base.xml b/tests/dictionaries/10valid_enum_python/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_python/00-base.xml rename to tests/dictionaries/10valid_enum_python/00-base.xml diff --git a/tests/flattener_dicos/10valid_enum_python/__init__.py b/tests/dictionaries/10valid_enum_python/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_python/__init__.py rename to tests/dictionaries/10valid_enum_python/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_python/makedict/base.json b/tests/dictionaries/10valid_enum_python/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10valid_enum_python/makedict/base.json rename to tests/dictionaries/10valid_enum_python/makedict/base.json diff --git a/tests/flattener_dicos/10valid_enum_python/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_python/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_python/tiramisu/__init__.py rename to tests/dictionaries/10valid_enum_python/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_python/tiramisu/base.py b/tests/dictionaries/10valid_enum_python/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/10valid_enum_python/tiramisu/base.py rename to tests/dictionaries/10valid_enum_python/tiramisu/base.py index d4ef10b5..78f0f8a3 100644 --- a/tests/flattener_dicos/10valid_enum_python/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_python/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='test', values=('test',)) diff --git a/tests/flattener_dicos/10valid_enum_value/00-base.xml b/tests/dictionaries/10valid_enum_value/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_value/00-base.xml rename to tests/dictionaries/10valid_enum_value/00-base.xml diff --git a/tests/flattener_dicos/10valid_enum_value/__init__.py b/tests/dictionaries/10valid_enum_value/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_value/__init__.py rename to tests/dictionaries/10valid_enum_value/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_value/makedict/base.json b/tests/dictionaries/10valid_enum_value/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10valid_enum_value/makedict/base.json rename to tests/dictionaries/10valid_enum_value/makedict/base.json diff --git a/tests/flattener_dicos/10valid_enum_value/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_value/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/10valid_enum_value/tiramisu/__init__.py rename to tests/dictionaries/10valid_enum_value/tiramisu/__init__.py diff --git a/tests/flattener_dicos/10valid_enum_value/tiramisu/base.py b/tests/dictionaries/10valid_enum_value/tiramisu/base.py similarity index 78% rename from tests/flattener_dicos/10valid_enum_value/tiramisu/base.py rename to tests/dictionaries/10valid_enum_value/tiramisu/base.py index 37db7b31..e4c891e0 100644 --- a/tests/flattener_dicos/10valid_enum_value/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_value/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='b', values=('a', 'b', 'c')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/11disabled_if_in_filelist/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist/00-base.xml similarity index 100% rename from tests/flattener_dicos/11disabled_if_in_filelist/00-base.xml rename to tests/dictionaries/11disabled_if_in_filelist/00-base.xml diff --git a/tests/flattener_dicos/11disabled_if_in_filelist/__init__.py b/tests/dictionaries/11disabled_if_in_filelist/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabled_if_in_filelist/__init__.py rename to tests/dictionaries/11disabled_if_in_filelist/__init__.py diff --git a/tests/flattener_dicos/11disabled_if_in_filelist/makedict/base.json b/tests/dictionaries/11disabled_if_in_filelist/makedict/base.json similarity index 100% rename from tests/flattener_dicos/11disabled_if_in_filelist/makedict/base.json rename to tests/dictionaries/11disabled_if_in_filelist/makedict/base.json diff --git a/tests/templates/11disabled_if_in_filelist/result/etc/file b/tests/dictionaries/11disabled_if_in_filelist/result/etc/file similarity index 100% rename from tests/templates/11disabled_if_in_filelist/result/etc/file rename to tests/dictionaries/11disabled_if_in_filelist/result/etc/file diff --git a/tests/flattener_dicos/11disabled_if_in_filelist/tiramisu/__init__.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabled_if_in_filelist/tiramisu/__init__.py rename to tests/dictionaries/11disabled_if_in_filelist/tiramisu/__init__.py diff --git a/tests/flattener_dicos/11disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py similarity index 94% rename from tests/flattener_dicos/11disabled_if_in_filelist/tiramisu/base.py rename to tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py index 89a5eb47..54331695 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = BoolOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default=True) diff --git a/tests/templates/11disabled_if_in_filelist/tmpl/file b/tests/dictionaries/11disabled_if_in_filelist/tmpl/file similarity index 100% rename from tests/templates/11disabled_if_in_filelist/tmpl/file rename to tests/dictionaries/11disabled_if_in_filelist/tmpl/file diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml similarity index 100% rename from tests/flattener_dicos/11disabled_if_in_filelist_disabled/00-base.xml rename to tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/__init__.py b/tests/dictionaries/11disabled_if_in_filelist_disabled/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabled_if_in_filelist_disabled/__init__.py rename to tests/dictionaries/11disabled_if_in_filelist_disabled/__init__.py diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/makedict/base.json b/tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/base.json similarity index 100% rename from tests/flattener_dicos/11disabled_if_in_filelist_disabled/makedict/base.json rename to tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/base.json diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/tiramisu/__init__.py b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabled_if_in_filelist_disabled/tiramisu/__init__.py rename to tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/__init__.py diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py similarity index 94% rename from tests/flattener_dicos/11disabled_if_in_filelist_disabled/tiramisu/base.py rename to tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py index 9711a198..99c29cd7 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/templates/11disabled_if_in_filelist_disabled/tmpl/file b/tests/dictionaries/11disabled_if_in_filelist_disabled/tmpl/file similarity index 100% rename from tests/templates/11disabled_if_in_filelist_disabled/tmpl/file rename to tests/dictionaries/11disabled_if_in_filelist_disabled/tmpl/file diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_multi/00-base.xml b/tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml similarity index 100% rename from tests/flattener_dicos/11disabled_if_in_filelist_multi/00-base.xml rename to tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_multi/__init__.py b/tests/dictionaries/11disabled_if_in_filelist_multi/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabled_if_in_filelist_multi/__init__.py rename to tests/dictionaries/11disabled_if_in_filelist_multi/__init__.py diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_multi/makedict/base.json b/tests/dictionaries/11disabled_if_in_filelist_multi/makedict/base.json similarity index 100% rename from tests/flattener_dicos/11disabled_if_in_filelist_multi/makedict/base.json rename to tests/dictionaries/11disabled_if_in_filelist_multi/makedict/base.json diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_multi/tiramisu/__init__.py b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabled_if_in_filelist_multi/tiramisu/__init__.py rename to tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/__init__.py diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_multi/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py similarity index 95% rename from tests/flattener_dicos/11disabled_if_in_filelist_multi/tiramisu/base.py rename to tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py index 484b7e57..0c5bc268 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/11disabledifin_filelist_notexist/00-base.xml b/tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml similarity index 100% rename from tests/flattener_dicos/11disabledifin_filelist_notexist/00-base.xml rename to tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml diff --git a/tests/flattener_dicos/11disabledifin_filelist_notexist/__init__.py b/tests/dictionaries/11disabledifin_filelist_notexist/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabledifin_filelist_notexist/__init__.py rename to tests/dictionaries/11disabledifin_filelist_notexist/__init__.py diff --git a/tests/flattener_dicos/11disabledifin_filelist_notexist/makedict/base.json b/tests/dictionaries/11disabledifin_filelist_notexist/makedict/base.json similarity index 100% rename from tests/flattener_dicos/11disabledifin_filelist_notexist/makedict/base.json rename to tests/dictionaries/11disabledifin_filelist_notexist/makedict/base.json diff --git a/tests/flattener_dicos/11disabledifin_filelist_notexist/tiramisu/__init__.py b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabledifin_filelist_notexist/tiramisu/__init__.py rename to tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/__init__.py diff --git a/tests/flattener_dicos/11disabledifin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py similarity index 93% rename from tests/flattener_dicos/11disabledifin_filelist_notexist/tiramisu/base.py rename to tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py index 25546cb5..29af91a5 100644 --- a/tests/flattener_dicos/11disabledifin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml similarity index 100% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist/00-base.xml rename to tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/__init__.py b/tests/dictionaries/11disabledifnotin_filelist_notexist/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist/__init__.py rename to tests/dictionaries/11disabledifnotin_filelist_notexist/__init__.py diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/makedict/base.json b/tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/base.json similarity index 100% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist/makedict/base.json rename to tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/base.json diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/tiramisu/__init__.py b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist/tiramisu/__init__.py rename to tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/__init__.py diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py similarity index 93% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py rename to tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py index 25546cb5..29af91a5 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml similarity index 100% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/00-base.xml rename to tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/__init__.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/__init__.py rename to tests/dictionaries/11disabledifnotin_filelist_notexist_multi/__init__.py diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/makedict/base.json b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/base.json similarity index 100% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/makedict/base.json rename to tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/base.json diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/tiramisu/__init__.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/tiramisu/__init__.py rename to tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/__init__.py diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py similarity index 93% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist/tiramisu/base.py rename to tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py index 25546cb5..29af91a5 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/00-base.xml b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml similarity index 100% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/00-base.xml rename to tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/__init__.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/__init__.py rename to tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/__init__.py diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/makedict/base.json b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/base.json similarity index 100% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/makedict/base.json rename to tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/base.json diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/tiramisu/__init__.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/tiramisu/__init__.py rename to tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/__init__.py diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py similarity index 94% rename from tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py rename to tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py index 53cd3efc..d0652baa 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('non', 'statique')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/11multi_disabled_if_in_filelist/00-base.xml b/tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml similarity index 100% rename from tests/flattener_dicos/11multi_disabled_if_in_filelist/00-base.xml rename to tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml diff --git a/tests/flattener_dicos/11multi_disabled_if_in_filelist/__init__.py b/tests/dictionaries/11multi_disabled_if_in_filelist/__init__.py similarity index 100% rename from tests/flattener_dicos/11multi_disabled_if_in_filelist/__init__.py rename to tests/dictionaries/11multi_disabled_if_in_filelist/__init__.py diff --git a/tests/flattener_dicos/11multi_disabled_if_in_filelist/makedict/base.json b/tests/dictionaries/11multi_disabled_if_in_filelist/makedict/base.json similarity index 100% rename from tests/flattener_dicos/11multi_disabled_if_in_filelist/makedict/base.json rename to tests/dictionaries/11multi_disabled_if_in_filelist/makedict/base.json diff --git a/tests/flattener_dicos/11multi_disabled_if_in_filelist/tiramisu/__init__.py b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/11multi_disabled_if_in_filelist/tiramisu/__init__.py rename to tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/__init__.py diff --git a/tests/flattener_dicos/11multi_disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/11multi_disabled_if_in_filelist/tiramisu/base.py rename to tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py index 10a32087..5eaf2816 100644 --- a/tests/flattener_dicos/11multi_disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/20family_append/00-base.xml b/tests/dictionaries/20family_append/00-base.xml similarity index 100% rename from tests/flattener_dicos/20family_append/00-base.xml rename to tests/dictionaries/20family_append/00-base.xml diff --git a/tests/flattener_dicos/20family_append/01-base.xml b/tests/dictionaries/20family_append/01-base.xml similarity index 100% rename from tests/flattener_dicos/20family_append/01-base.xml rename to tests/dictionaries/20family_append/01-base.xml diff --git a/tests/flattener_dicos/20family_append/__init__.py b/tests/dictionaries/20family_append/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_append/__init__.py rename to tests/dictionaries/20family_append/__init__.py diff --git a/tests/flattener_dicos/20family_append/makedict/base.json b/tests/dictionaries/20family_append/makedict/base.json similarity index 100% rename from tests/flattener_dicos/20family_append/makedict/base.json rename to tests/dictionaries/20family_append/makedict/base.json diff --git a/tests/flattener_dicos/20family_append/tiramisu/__init__.py b/tests/dictionaries/20family_append/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_append/tiramisu/__init__.py rename to tests/dictionaries/20family_append/tiramisu/__init__.py diff --git a/tests/flattener_dicos/20family_append/tiramisu/base.py b/tests/dictionaries/20family_append/tiramisu/base.py similarity index 84% rename from tests/flattener_dicos/20family_append/tiramisu/base.py rename to tests/dictionaries/20family_append/tiramisu/base.py index 73aae3ad..5265212c 100644 --- a/tests/flattener_dicos/20family_append/tiramisu/base.py +++ b/tests/dictionaries/20family_append/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/20family_appendaccent/00-base.xml b/tests/dictionaries/20family_appendaccent/00-base.xml similarity index 100% rename from tests/flattener_dicos/20family_appendaccent/00-base.xml rename to tests/dictionaries/20family_appendaccent/00-base.xml diff --git a/tests/flattener_dicos/20family_appendaccent/01-base.xml b/tests/dictionaries/20family_appendaccent/01-base.xml similarity index 100% rename from tests/flattener_dicos/20family_appendaccent/01-base.xml rename to tests/dictionaries/20family_appendaccent/01-base.xml diff --git a/tests/flattener_dicos/20family_appendaccent/02-base.xml b/tests/dictionaries/20family_appendaccent/02-base.xml similarity index 100% rename from tests/flattener_dicos/20family_appendaccent/02-base.xml rename to tests/dictionaries/20family_appendaccent/02-base.xml diff --git a/tests/flattener_dicos/20family_appendaccent/__init__.py b/tests/dictionaries/20family_appendaccent/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_appendaccent/__init__.py rename to tests/dictionaries/20family_appendaccent/__init__.py diff --git a/tests/flattener_dicos/20family_appendaccent/makedict/base.json b/tests/dictionaries/20family_appendaccent/makedict/base.json similarity index 100% rename from tests/flattener_dicos/20family_appendaccent/makedict/base.json rename to tests/dictionaries/20family_appendaccent/makedict/base.json diff --git a/tests/flattener_dicos/20family_appendaccent/tiramisu/__init__.py b/tests/dictionaries/20family_appendaccent/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_appendaccent/tiramisu/__init__.py rename to tests/dictionaries/20family_appendaccent/tiramisu/__init__.py diff --git a/tests/flattener_dicos/20family_appendaccent/tiramisu/base.py b/tests/dictionaries/20family_appendaccent/tiramisu/base.py similarity index 91% rename from tests/flattener_dicos/20family_appendaccent/tiramisu/base.py rename to tests/dictionaries/20family_appendaccent/tiramisu/base.py index ad7de930..f0d24a78 100644 --- a/tests/flattener_dicos/20family_appendaccent/tiramisu/base.py +++ b/tests/dictionaries/20family_appendaccent/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_7 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif3', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/20family_dynamic/00-base.xml b/tests/dictionaries/20family_dynamic/00-base.xml similarity index 100% rename from tests/flattener_dicos/20family_dynamic/00-base.xml rename to tests/dictionaries/20family_dynamic/00-base.xml diff --git a/tests/flattener_dicos/20family_dynamic/__init__.py b/tests/dictionaries/20family_dynamic/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_dynamic/__init__.py rename to tests/dictionaries/20family_dynamic/__init__.py diff --git a/tests/flattener_dicos/20family_dynamic/makedict/base.json b/tests/dictionaries/20family_dynamic/makedict/base.json similarity index 100% rename from tests/flattener_dicos/20family_dynamic/makedict/base.json rename to tests/dictionaries/20family_dynamic/makedict/base.json diff --git a/tests/flattener_dicos/20family_dynamic/tiramisu/__init__.py b/tests/dictionaries/20family_dynamic/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_dynamic/tiramisu/__init__.py rename to tests/dictionaries/20family_dynamic/tiramisu/__init__.py diff --git a/tests/flattener_dicos/20family_dynamic/tiramisu/base.py b/tests/dictionaries/20family_dynamic/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/20family_dynamic/tiramisu/base.py rename to tests/dictionaries/20family_dynamic/tiramisu/base.py index 9c247faa..5e330242 100644 --- a/tests/flattener_dicos/20family_dynamic/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2') option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_5 = StrOption(properties=frozenset({'normal'}), name='vardyn', doc='No change', multi=False) diff --git a/tests/flattener_dicos/20family_dynamic_calc/00-base.xml b/tests/dictionaries/20family_dynamic_calc/00-base.xml similarity index 100% rename from tests/flattener_dicos/20family_dynamic_calc/00-base.xml rename to tests/dictionaries/20family_dynamic_calc/00-base.xml diff --git a/tests/flattener_dicos/20family_dynamic_calc/__init__.py b/tests/dictionaries/20family_dynamic_calc/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_dynamic_calc/__init__.py rename to tests/dictionaries/20family_dynamic_calc/__init__.py diff --git a/tests/flattener_dicos/20family_dynamic_calc/makedict/base.json b/tests/dictionaries/20family_dynamic_calc/makedict/base.json similarity index 100% rename from tests/flattener_dicos/20family_dynamic_calc/makedict/base.json rename to tests/dictionaries/20family_dynamic_calc/makedict/base.json diff --git a/tests/flattener_dicos/20family_dynamic_calc/tiramisu/__init__.py b/tests/dictionaries/20family_dynamic_calc/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_dynamic_calc/tiramisu/__init__.py rename to tests/dictionaries/20family_dynamic_calc/tiramisu/__init__.py diff --git a/tests/flattener_dicos/20family_dynamic_calc/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/20family_dynamic_calc/tiramisu/base.py rename to tests/dictionaries/20family_dynamic_calc/tiramisu/base.py index 5f7e13a9..c6a6ec95 100644 --- a/tests/flattener_dicos/20family_dynamic_calc/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2') option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_5 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='vardyn', doc='No change', multi=False, default='val') diff --git a/tests/flattener_dicos/20family_dynamic_number/00-base.xml b/tests/dictionaries/20family_dynamic_number/00-base.xml similarity index 100% rename from tests/flattener_dicos/20family_dynamic_number/00-base.xml rename to tests/dictionaries/20family_dynamic_number/00-base.xml diff --git a/tests/flattener_dicos/20family_dynamic_number/__init__.py b/tests/dictionaries/20family_dynamic_number/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_dynamic_number/__init__.py rename to tests/dictionaries/20family_dynamic_number/__init__.py diff --git a/tests/flattener_dicos/20family_dynamic_number/makedict/base.json b/tests/dictionaries/20family_dynamic_number/makedict/base.json similarity index 100% rename from tests/flattener_dicos/20family_dynamic_number/makedict/base.json rename to tests/dictionaries/20family_dynamic_number/makedict/base.json diff --git a/tests/flattener_dicos/20family_dynamic_number/tiramisu/__init__.py b/tests/dictionaries/20family_dynamic_number/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_dynamic_number/tiramisu/__init__.py rename to tests/dictionaries/20family_dynamic_number/tiramisu/__init__.py diff --git a/tests/flattener_dicos/20family_dynamic_number/tiramisu/base.py b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/20family_dynamic_number/tiramisu/base.py rename to tests/dictionaries/20family_dynamic_number/tiramisu/base.py index 0f461578..710a1b52 100644 --- a/tests/flattener_dicos/20family_dynamic_number/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = IntOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=[1, 2], default_multi=2) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_5 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='vardyn', doc='No change', multi=False, default='val') diff --git a/tests/flattener_dicos/20family_empty/00-base.xml b/tests/dictionaries/20family_empty/00-base.xml similarity index 100% rename from tests/flattener_dicos/20family_empty/00-base.xml rename to tests/dictionaries/20family_empty/00-base.xml diff --git a/tests/flattener_dicos/20family_empty/__init__.py b/tests/dictionaries/20family_empty/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_empty/__init__.py rename to tests/dictionaries/20family_empty/__init__.py diff --git a/tests/flattener_dicos/20family_empty/makedict/base.json b/tests/dictionaries/20family_empty/makedict/base.json similarity index 100% rename from tests/flattener_dicos/20family_empty/makedict/base.json rename to tests/dictionaries/20family_empty/makedict/base.json diff --git a/tests/flattener_dicos/20family_empty/tiramisu/__init__.py b/tests/dictionaries/20family_empty/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_empty/tiramisu/__init__.py rename to tests/dictionaries/20family_empty/tiramisu/__init__.py diff --git a/tests/flattener_dicos/20family_empty/tiramisu/base.py b/tests/dictionaries/20family_empty/tiramisu/base.py similarity index 78% rename from tests/flattener_dicos/20family_empty/tiramisu/base.py rename to tests/dictionaries/20family_empty/tiramisu/base.py index 5564f282..87d36ec4 100644 --- a/tests/flattener_dicos/20family_empty/tiramisu/base.py +++ b/tests/dictionaries/20family_empty/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'basic', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/20family_hidden/00-base.xml b/tests/dictionaries/20family_hidden/00-base.xml similarity index 100% rename from tests/flattener_dicos/20family_hidden/00-base.xml rename to tests/dictionaries/20family_hidden/00-base.xml diff --git a/tests/flattener_dicos/20family_hidden/01-base.xml b/tests/dictionaries/20family_hidden/01-base.xml similarity index 100% rename from tests/flattener_dicos/20family_hidden/01-base.xml rename to tests/dictionaries/20family_hidden/01-base.xml diff --git a/tests/flattener_dicos/20family_hidden/__init__.py b/tests/dictionaries/20family_hidden/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_hidden/__init__.py rename to tests/dictionaries/20family_hidden/__init__.py diff --git a/tests/flattener_dicos/20family_hidden/makedict/base.json b/tests/dictionaries/20family_hidden/makedict/base.json similarity index 100% rename from tests/flattener_dicos/20family_hidden/makedict/base.json rename to tests/dictionaries/20family_hidden/makedict/base.json diff --git a/tests/flattener_dicos/20family_hidden/tiramisu/__init__.py b/tests/dictionaries/20family_hidden/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_hidden/tiramisu/__init__.py rename to tests/dictionaries/20family_hidden/tiramisu/__init__.py diff --git a/tests/flattener_dicos/20family_hidden/tiramisu/base.py b/tests/dictionaries/20family_hidden/tiramisu/base.py similarity index 80% rename from tests/flattener_dicos/20family_hidden/tiramisu/base.py rename to tests/dictionaries/20family_hidden/tiramisu/base.py index 0ad7e3eb..511914f5 100644 --- a/tests/flattener_dicos/20family_hidden/tiramisu/base.py +++ b/tests/dictionaries/20family_hidden/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'hidden', 'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/20family_mode/00-base.xml b/tests/dictionaries/20family_mode/00-base.xml similarity index 100% rename from tests/flattener_dicos/20family_mode/00-base.xml rename to tests/dictionaries/20family_mode/00-base.xml diff --git a/tests/flattener_dicos/20family_mode/__init__.py b/tests/dictionaries/20family_mode/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_mode/__init__.py rename to tests/dictionaries/20family_mode/__init__.py diff --git a/tests/flattener_dicos/20family_mode/makedict/base.json b/tests/dictionaries/20family_mode/makedict/base.json similarity index 100% rename from tests/flattener_dicos/20family_mode/makedict/base.json rename to tests/dictionaries/20family_mode/makedict/base.json diff --git a/tests/flattener_dicos/20family_mode/tiramisu/__init__.py b/tests/dictionaries/20family_mode/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_mode/tiramisu/__init__.py rename to tests/dictionaries/20family_mode/tiramisu/__init__.py diff --git a/tests/flattener_dicos/20family_mode/tiramisu/base.py b/tests/dictionaries/20family_mode/tiramisu/base.py similarity index 78% rename from tests/flattener_dicos/20family_mode/tiramisu/base.py rename to tests/dictionaries/20family_mode/tiramisu/base.py index 5564f282..87d36ec4 100644 --- a/tests/flattener_dicos/20family_mode/tiramisu/base.py +++ b/tests/dictionaries/20family_mode/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'basic', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/20family_modeleadership/00-base.xml b/tests/dictionaries/20family_modeleadership/00-base.xml similarity index 100% rename from tests/flattener_dicos/20family_modeleadership/00-base.xml rename to tests/dictionaries/20family_modeleadership/00-base.xml diff --git a/tests/flattener_dicos/20family_modeleadership/__init__.py b/tests/dictionaries/20family_modeleadership/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_modeleadership/__init__.py rename to tests/dictionaries/20family_modeleadership/__init__.py diff --git a/tests/flattener_dicos/20family_modeleadership/makedict/base.json b/tests/dictionaries/20family_modeleadership/makedict/base.json similarity index 100% rename from tests/flattener_dicos/20family_modeleadership/makedict/base.json rename to tests/dictionaries/20family_modeleadership/makedict/base.json diff --git a/tests/flattener_dicos/20family_modeleadership/tiramisu/__init__.py b/tests/dictionaries/20family_modeleadership/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/20family_modeleadership/tiramisu/__init__.py rename to tests/dictionaries/20family_modeleadership/tiramisu/__init__.py diff --git a/tests/flattener_dicos/20family_modeleadership/tiramisu/base.py b/tests/dictionaries/20family_modeleadership/tiramisu/base.py similarity index 86% rename from tests/flattener_dicos/20family_modeleadership/tiramisu/base.py rename to tests/dictionaries/20family_modeleadership/tiramisu/base.py index 750be987..c93cccdc 100644 --- a/tests/flattener_dicos/20family_modeleadership/tiramisu/base.py +++ b/tests/dictionaries/20family_modeleadership/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True) diff --git a/tests/flattener_dicos/20notemplating/00-base.xml b/tests/dictionaries/20notemplating/00-base.xml similarity index 100% rename from tests/flattener_dicos/20notemplating/00-base.xml rename to tests/dictionaries/20notemplating/00-base.xml diff --git a/tests/flattener_dicos/20notemplating/__init__.py b/tests/dictionaries/20notemplating/__init__.py similarity index 100% rename from tests/flattener_dicos/20notemplating/__init__.py rename to tests/dictionaries/20notemplating/__init__.py diff --git a/tests/flattener_dicos/20notemplating/makedict/base.json b/tests/dictionaries/20notemplating/makedict/base.json similarity index 100% rename from tests/flattener_dicos/20notemplating/makedict/base.json rename to tests/dictionaries/20notemplating/makedict/base.json diff --git a/tests/templates/20notemplating/result/etc/file b/tests/dictionaries/20notemplating/result/etc/file similarity index 100% rename from tests/templates/20notemplating/result/etc/file rename to tests/dictionaries/20notemplating/result/etc/file diff --git a/tests/flattener_dicos/20notemplating/tiramisu/__init__.py b/tests/dictionaries/20notemplating/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/20notemplating/tiramisu/__init__.py rename to tests/dictionaries/20notemplating/tiramisu/__init__.py diff --git a/tests/flattener_dicos/20notemplating/tiramisu/base.py b/tests/dictionaries/20notemplating/tiramisu/base.py similarity index 91% rename from tests/flattener_dicos/20notemplating/tiramisu/base.py rename to tests/dictionaries/20notemplating/tiramisu/base.py index 13f053b2..1c78ea07 100644 --- a/tests/flattener_dicos/20notemplating/tiramisu/base.py +++ b/tests/dictionaries/20notemplating/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/templates/20notemplating/tmpl/file b/tests/dictionaries/20notemplating/tmpl/file similarity index 100% rename from tests/templates/20notemplating/tmpl/file rename to tests/dictionaries/20notemplating/tmpl/file diff --git a/tests/flattener_dicos/20override/00-base.xml b/tests/dictionaries/20override/00-base.xml similarity index 100% rename from tests/flattener_dicos/20override/00-base.xml rename to tests/dictionaries/20override/00-base.xml diff --git a/tests/flattener_dicos/20override/__init__.py b/tests/dictionaries/20override/__init__.py similarity index 100% rename from tests/flattener_dicos/20override/__init__.py rename to tests/dictionaries/20override/__init__.py diff --git a/tests/flattener_dicos/20override/makedict/base.json b/tests/dictionaries/20override/makedict/base.json similarity index 100% rename from tests/flattener_dicos/20override/makedict/base.json rename to tests/dictionaries/20override/makedict/base.json diff --git a/tests/templates/20override/result/systemd/system/test.service.d/rougail.conf b/tests/dictionaries/20override/result/systemd/system/test.service.d/rougail.conf similarity index 100% rename from tests/templates/20override/result/systemd/system/test.service.d/rougail.conf rename to tests/dictionaries/20override/result/systemd/system/test.service.d/rougail.conf diff --git a/tests/flattener_dicos/20override/tiramisu/__init__.py b/tests/dictionaries/20override/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/20override/tiramisu/__init__.py rename to tests/dictionaries/20override/tiramisu/__init__.py diff --git a/tests/flattener_dicos/20override/tiramisu/base.py b/tests/dictionaries/20override/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/20override/tiramisu/base.py rename to tests/dictionaries/20override/tiramisu/base.py index 1f93931f..dea870ab 100644 --- a/tests/flattener_dicos/20override/tiramisu/base.py +++ b/tests/dictionaries/20override/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/templates/20override/tmpl/test.service b/tests/dictionaries/20override/tmpl/test.service similarity index 100% rename from tests/templates/20override/tmpl/test.service rename to tests/dictionaries/20override/tmpl/test.service diff --git a/tests/flattener_dicos/21family_change/00-base.xml b/tests/dictionaries/21family_change/00-base.xml similarity index 100% rename from tests/flattener_dicos/21family_change/00-base.xml rename to tests/dictionaries/21family_change/00-base.xml diff --git a/tests/flattener_dicos/21family_change/01-base.xml b/tests/dictionaries/21family_change/01-base.xml similarity index 100% rename from tests/flattener_dicos/21family_change/01-base.xml rename to tests/dictionaries/21family_change/01-base.xml diff --git a/tests/flattener_dicos/21family_change/__init__.py b/tests/dictionaries/21family_change/__init__.py similarity index 100% rename from tests/flattener_dicos/21family_change/__init__.py rename to tests/dictionaries/21family_change/__init__.py diff --git a/tests/flattener_dicos/21family_change/makedict/base.json b/tests/dictionaries/21family_change/makedict/base.json similarity index 100% rename from tests/flattener_dicos/21family_change/makedict/base.json rename to tests/dictionaries/21family_change/makedict/base.json diff --git a/tests/flattener_dicos/21family_change/tiramisu/__init__.py b/tests/dictionaries/21family_change/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/21family_change/tiramisu/__init__.py rename to tests/dictionaries/21family_change/tiramisu/__init__.py diff --git a/tests/flattener_dicos/21family_change/tiramisu/base.py b/tests/dictionaries/21family_change/tiramisu/base.py similarity index 86% rename from tests/flattener_dicos/21family_change/tiramisu/base.py rename to tests/dictionaries/21family_change/tiramisu/base.py index 656a3a6f..f8cfc872 100644 --- a/tests/flattener_dicos/21family_change/tiramisu/base.py +++ b/tests/dictionaries/21family_change/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/21family_changeaccent/00-base.xml b/tests/dictionaries/21family_changeaccent/00-base.xml similarity index 100% rename from tests/flattener_dicos/21family_changeaccent/00-base.xml rename to tests/dictionaries/21family_changeaccent/00-base.xml diff --git a/tests/flattener_dicos/21family_changeaccent/01-base.xml b/tests/dictionaries/21family_changeaccent/01-base.xml similarity index 100% rename from tests/flattener_dicos/21family_changeaccent/01-base.xml rename to tests/dictionaries/21family_changeaccent/01-base.xml diff --git a/tests/flattener_dicos/21family_changeaccent/__init__.py b/tests/dictionaries/21family_changeaccent/__init__.py similarity index 100% rename from tests/flattener_dicos/21family_changeaccent/__init__.py rename to tests/dictionaries/21family_changeaccent/__init__.py diff --git a/tests/flattener_dicos/21family_changeaccent/makedict/base.json b/tests/dictionaries/21family_changeaccent/makedict/base.json similarity index 100% rename from tests/flattener_dicos/21family_changeaccent/makedict/base.json rename to tests/dictionaries/21family_changeaccent/makedict/base.json diff --git a/tests/flattener_dicos/21family_changeaccent/tiramisu/__init__.py b/tests/dictionaries/21family_changeaccent/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/21family_changeaccent/tiramisu/__init__.py rename to tests/dictionaries/21family_changeaccent/tiramisu/__init__.py diff --git a/tests/flattener_dicos/21family_changeaccent/tiramisu/base.py b/tests/dictionaries/21family_changeaccent/tiramisu/base.py similarity index 86% rename from tests/flattener_dicos/21family_changeaccent/tiramisu/base.py rename to tests/dictionaries/21family_changeaccent/tiramisu/base.py index 06befc68..cd8fc809 100644 --- a/tests/flattener_dicos/21family_changeaccent/tiramisu/base.py +++ b/tests/dictionaries/21family_changeaccent/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3]) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/21family_empty/00-base.xml b/tests/dictionaries/21family_empty/00-base.xml similarity index 100% rename from tests/flattener_dicos/21family_empty/00-base.xml rename to tests/dictionaries/21family_empty/00-base.xml diff --git a/tests/flattener_dicos/21family_empty/__init__.py b/tests/dictionaries/21family_empty/__init__.py similarity index 100% rename from tests/flattener_dicos/21family_empty/__init__.py rename to tests/dictionaries/21family_empty/__init__.py diff --git a/tests/flattener_dicos/21family_empty/makedict/base.json b/tests/dictionaries/21family_empty/makedict/base.json similarity index 100% rename from tests/flattener_dicos/21family_empty/makedict/base.json rename to tests/dictionaries/21family_empty/makedict/base.json diff --git a/tests/flattener_dicos/21family_empty/tiramisu/__init__.py b/tests/dictionaries/21family_empty/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/21family_empty/tiramisu/__init__.py rename to tests/dictionaries/21family_empty/tiramisu/__init__.py diff --git a/tests/flattener_dicos/21family_empty/tiramisu/base.py b/tests/dictionaries/21family_empty/tiramisu/base.py similarity index 78% rename from tests/flattener_dicos/21family_empty/tiramisu/base.py rename to tests/dictionaries/21family_empty/tiramisu/base.py index 5783a3af..637aec54 100644 --- a/tests/flattener_dicos/21family_empty/tiramisu/base.py +++ b/tests/dictionaries/21family_empty/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/30mandatory_withoutvalue/00-base.xml b/tests/dictionaries/30mandatory_withoutvalue/00-base.xml similarity index 100% rename from tests/flattener_dicos/30mandatory_withoutvalue/00-base.xml rename to tests/dictionaries/30mandatory_withoutvalue/00-base.xml diff --git a/tests/flattener_dicos/30mandatory_withoutvalue/__init__.py b/tests/dictionaries/30mandatory_withoutvalue/__init__.py similarity index 100% rename from tests/flattener_dicos/30mandatory_withoutvalue/__init__.py rename to tests/dictionaries/30mandatory_withoutvalue/__init__.py diff --git a/tests/flattener_dicos/30mandatory_withoutvalue/makedict/base.json b/tests/dictionaries/30mandatory_withoutvalue/makedict/base.json similarity index 100% rename from tests/flattener_dicos/30mandatory_withoutvalue/makedict/base.json rename to tests/dictionaries/30mandatory_withoutvalue/makedict/base.json diff --git a/tests/flattener_dicos/30mandatory_withoutvalue/tiramisu/__init__.py b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/30mandatory_withoutvalue/tiramisu/__init__.py rename to tests/dictionaries/30mandatory_withoutvalue/tiramisu/__init__.py diff --git a/tests/flattener_dicos/30mandatory_withoutvalue/tiramisu/base.py b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py similarity index 77% rename from tests/flattener_dicos/30mandatory_withoutvalue/tiramisu/base.py rename to tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py index 68122e25..e0a63eeb 100644 --- a/tests/flattener_dicos/30mandatory_withoutvalue/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = StrOption(properties=frozenset({'basic', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/00-base.xml b/tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml similarity index 100% rename from tests/flattener_dicos/30mandatory_withoutvaluecalc/00-base.xml rename to tests/dictionaries/30mandatory_withoutvaluecalc/00-base.xml diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/__init__.py b/tests/dictionaries/30mandatory_withoutvaluecalc/__init__.py similarity index 100% rename from tests/flattener_dicos/30mandatory_withoutvaluecalc/__init__.py rename to tests/dictionaries/30mandatory_withoutvaluecalc/__init__.py diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/makedict/base.json b/tests/dictionaries/30mandatory_withoutvaluecalc/makedict/base.json similarity index 100% rename from tests/flattener_dicos/30mandatory_withoutvaluecalc/makedict/base.json rename to tests/dictionaries/30mandatory_withoutvaluecalc/makedict/base.json diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/tiramisu/__init__.py b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/30mandatory_withoutvaluecalc/tiramisu/__init__.py rename to tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/__init__.py diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py similarity index 81% rename from tests/flattener_dicos/30mandatory_withoutvaluecalc/tiramisu/base.py rename to tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py index d0607494..f01e932b 100644 --- a/tests/flattener_dicos/30mandatory_withoutvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={}))) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/30mandatory_withvalue/00-base.xml b/tests/dictionaries/30mandatory_withvalue/00-base.xml similarity index 100% rename from tests/flattener_dicos/30mandatory_withvalue/00-base.xml rename to tests/dictionaries/30mandatory_withvalue/00-base.xml diff --git a/tests/flattener_dicos/30mandatory_withvalue/__init__.py b/tests/dictionaries/30mandatory_withvalue/__init__.py similarity index 100% rename from tests/flattener_dicos/30mandatory_withvalue/__init__.py rename to tests/dictionaries/30mandatory_withvalue/__init__.py diff --git a/tests/flattener_dicos/30mandatory_withvalue/makedict/base.json b/tests/dictionaries/30mandatory_withvalue/makedict/base.json similarity index 100% rename from tests/flattener_dicos/30mandatory_withvalue/makedict/base.json rename to tests/dictionaries/30mandatory_withvalue/makedict/base.json diff --git a/tests/flattener_dicos/30mandatory_withvalue/tiramisu/__init__.py b/tests/dictionaries/30mandatory_withvalue/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/30mandatory_withvalue/tiramisu/__init__.py rename to tests/dictionaries/30mandatory_withvalue/tiramisu/__init__.py diff --git a/tests/flattener_dicos/30mandatory_withvalue/tiramisu/base.py b/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py similarity index 77% rename from tests/flattener_dicos/30mandatory_withvalue/tiramisu/base.py rename to tests/dictionaries/30mandatory_withvalue/tiramisu/base.py index d4754797..28cfbf16 100644 --- a/tests/flattener_dicos/30mandatory_withvalue/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='value') option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/00-base.xml b/tests/dictionaries/30mandatory_withvaluecalc/00-base.xml similarity index 100% rename from tests/flattener_dicos/30mandatory_withvaluecalc/00-base.xml rename to tests/dictionaries/30mandatory_withvaluecalc/00-base.xml diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/__init__.py b/tests/dictionaries/30mandatory_withvaluecalc/__init__.py similarity index 100% rename from tests/flattener_dicos/30mandatory_withvaluecalc/__init__.py rename to tests/dictionaries/30mandatory_withvaluecalc/__init__.py diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/makedict/base.json b/tests/dictionaries/30mandatory_withvaluecalc/makedict/base.json similarity index 100% rename from tests/flattener_dicos/30mandatory_withvaluecalc/makedict/base.json rename to tests/dictionaries/30mandatory_withvaluecalc/makedict/base.json diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/tiramisu/__init__.py b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/30mandatory_withvaluecalc/tiramisu/__init__.py rename to tests/dictionaries/30mandatory_withvaluecalc/tiramisu/__init__.py diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py similarity index 79% rename from tests/flattener_dicos/30mandatory_withvaluecalc/tiramisu/base.py rename to tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py index c5a386fc..e333ae87 100644 --- a/tests/flattener_dicos/30mandatory_withvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={}))) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/40condition_base/00-base.xml b/tests/dictionaries/40condition_base/00-base.xml similarity index 100% rename from tests/flattener_dicos/40condition_base/00-base.xml rename to tests/dictionaries/40condition_base/00-base.xml diff --git a/tests/flattener_dicos/40condition_base/__init__.py b/tests/dictionaries/40condition_base/__init__.py similarity index 100% rename from tests/flattener_dicos/40condition_base/__init__.py rename to tests/dictionaries/40condition_base/__init__.py diff --git a/tests/flattener_dicos/40condition_base/makedict/base.json b/tests/dictionaries/40condition_base/makedict/base.json similarity index 100% rename from tests/flattener_dicos/40condition_base/makedict/base.json rename to tests/dictionaries/40condition_base/makedict/base.json diff --git a/tests/flattener_dicos/40condition_base/tiramisu/__init__.py b/tests/dictionaries/40condition_base/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/40condition_base/tiramisu/__init__.py rename to tests/dictionaries/40condition_base/tiramisu/__init__.py diff --git a/tests/flattener_dicos/40condition_base/tiramisu/base.py b/tests/dictionaries/40condition_base/tiramisu/base.py similarity index 90% rename from tests/flattener_dicos/40condition_base/tiramisu/base.py rename to tests/dictionaries/40condition_base/tiramisu/base.py index 559c540b..2c557ea2 100644 --- a/tests/flattener_dicos/40condition_base/tiramisu/base.py +++ b/tests/dictionaries/40condition_base/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/40condition_fallback/00-base.xml b/tests/dictionaries/40condition_fallback/00-base.xml similarity index 100% rename from tests/flattener_dicos/40condition_fallback/00-base.xml rename to tests/dictionaries/40condition_fallback/00-base.xml diff --git a/tests/flattener_dicos/40condition_fallback/__init__.py b/tests/dictionaries/40condition_fallback/__init__.py similarity index 100% rename from tests/flattener_dicos/40condition_fallback/__init__.py rename to tests/dictionaries/40condition_fallback/__init__.py diff --git a/tests/flattener_dicos/40condition_fallback/makedict/base.json b/tests/dictionaries/40condition_fallback/makedict/base.json similarity index 100% rename from tests/flattener_dicos/40condition_fallback/makedict/base.json rename to tests/dictionaries/40condition_fallback/makedict/base.json diff --git a/tests/flattener_dicos/40condition_fallback/tiramisu/__init__.py b/tests/dictionaries/40condition_fallback/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/40condition_fallback/tiramisu/__init__.py rename to tests/dictionaries/40condition_fallback/tiramisu/__init__.py diff --git a/tests/flattener_dicos/40condition_fallback/tiramisu/base.py b/tests/dictionaries/40condition_fallback/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/40condition_fallback/tiramisu/base.py rename to tests/dictionaries/40condition_fallback/tiramisu/base.py index 31bcc573..75ef8f53 100644 --- a/tests/flattener_dicos/40condition_fallback/tiramisu/base.py +++ b/tests/dictionaries/40condition_fallback/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'disabled', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'disabled', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/40condition_optional/00-base.xml b/tests/dictionaries/40condition_optional/00-base.xml similarity index 100% rename from tests/flattener_dicos/40condition_optional/00-base.xml rename to tests/dictionaries/40condition_optional/00-base.xml diff --git a/tests/flattener_dicos/40condition_optional/__init__.py b/tests/dictionaries/40condition_optional/__init__.py similarity index 100% rename from tests/flattener_dicos/40condition_optional/__init__.py rename to tests/dictionaries/40condition_optional/__init__.py diff --git a/tests/flattener_dicos/40condition_optional/makedict/base.json b/tests/dictionaries/40condition_optional/makedict/base.json similarity index 100% rename from tests/flattener_dicos/40condition_optional/makedict/base.json rename to tests/dictionaries/40condition_optional/makedict/base.json diff --git a/tests/flattener_dicos/40condition_optional/tiramisu/__init__.py b/tests/dictionaries/40condition_optional/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/40condition_optional/tiramisu/__init__.py rename to tests/dictionaries/40condition_optional/tiramisu/__init__.py diff --git a/tests/flattener_dicos/40condition_optional/tiramisu/base.py b/tests/dictionaries/40condition_optional/tiramisu/base.py similarity index 87% rename from tests/flattener_dicos/40condition_optional/tiramisu/base.py rename to tests/dictionaries/40condition_optional/tiramisu/base.py index 6e3280b2..34bba746 100644 --- a/tests/flattener_dicos/40condition_optional/tiramisu/base.py +++ b/tests/dictionaries/40condition_optional/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/40hidden_if_in_group_fallback/00-base.xml b/tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml similarity index 100% rename from tests/flattener_dicos/40hidden_if_in_group_fallback/00-base.xml rename to tests/dictionaries/40hidden_if_in_group_fallback/00-base.xml diff --git a/tests/flattener_dicos/40hidden_if_in_group_fallback/__init__.py b/tests/dictionaries/40hidden_if_in_group_fallback/__init__.py similarity index 100% rename from tests/flattener_dicos/40hidden_if_in_group_fallback/__init__.py rename to tests/dictionaries/40hidden_if_in_group_fallback/__init__.py diff --git a/tests/flattener_dicos/40hidden_if_in_group_fallback/makedict/base.json b/tests/dictionaries/40hidden_if_in_group_fallback/makedict/base.json similarity index 100% rename from tests/flattener_dicos/40hidden_if_in_group_fallback/makedict/base.json rename to tests/dictionaries/40hidden_if_in_group_fallback/makedict/base.json diff --git a/tests/flattener_dicos/40hidden_if_in_group_fallback/tiramisu/__init__.py b/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/40hidden_if_in_group_fallback/tiramisu/__init__.py rename to tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/__init__.py diff --git a/tests/flattener_dicos/40hidden_if_in_group_fallback/tiramisu/base.py b/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py similarity index 88% rename from tests/flattener_dicos/40hidden_if_in_group_fallback/tiramisu/base.py rename to tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py index 196f78e4..5ed4ca22 100644 --- a/tests/flattener_dicos/40hidden_if_in_group_fallback/tiramisu/base.py +++ b/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'mandatory'}), name='mode_conteneur_actif1', doc='No change', multi=True, default=['non'], values=('oui', 'non')) option_6 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=True, default_multi='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/40ifin_leadership/00-base.xml b/tests/dictionaries/40ifin_leadership/00-base.xml similarity index 100% rename from tests/flattener_dicos/40ifin_leadership/00-base.xml rename to tests/dictionaries/40ifin_leadership/00-base.xml diff --git a/tests/flattener_dicos/40ifin_leadership/__init__.py b/tests/dictionaries/40ifin_leadership/__init__.py similarity index 100% rename from tests/flattener_dicos/40ifin_leadership/__init__.py rename to tests/dictionaries/40ifin_leadership/__init__.py diff --git a/tests/flattener_dicos/40ifin_leadership/makedict/base.json b/tests/dictionaries/40ifin_leadership/makedict/base.json similarity index 100% rename from tests/flattener_dicos/40ifin_leadership/makedict/base.json rename to tests/dictionaries/40ifin_leadership/makedict/base.json diff --git a/tests/flattener_dicos/40ifin_leadership/tiramisu/__init__.py b/tests/dictionaries/40ifin_leadership/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/40ifin_leadership/tiramisu/__init__.py rename to tests/dictionaries/40ifin_leadership/tiramisu/__init__.py diff --git a/tests/flattener_dicos/40ifin_leadership/tiramisu/base.py b/tests/dictionaries/40ifin_leadership/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/40ifin_leadership/tiramisu/base.py rename to tests/dictionaries/40ifin_leadership/tiramisu/base.py index 1c97b9f2..067f9fef 100644 --- a/tests/flattener_dicos/40ifin_leadership/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadership/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='condition', multi=False, default='oui', values=('oui', 'non')) option_6 = StrOption(name='leader', doc='leader', multi=True) diff --git a/tests/flattener_dicos/40ifin_leadershipauto/00-base.xml b/tests/dictionaries/40ifin_leadershipauto/00-base.xml similarity index 100% rename from tests/flattener_dicos/40ifin_leadershipauto/00-base.xml rename to tests/dictionaries/40ifin_leadershipauto/00-base.xml diff --git a/tests/flattener_dicos/40ifin_leadershipauto/__init__.py b/tests/dictionaries/40ifin_leadershipauto/__init__.py similarity index 100% rename from tests/flattener_dicos/40ifin_leadershipauto/__init__.py rename to tests/dictionaries/40ifin_leadershipauto/__init__.py diff --git a/tests/flattener_dicos/40ifin_leadershipauto/makedict/base.json b/tests/dictionaries/40ifin_leadershipauto/makedict/base.json similarity index 100% rename from tests/flattener_dicos/40ifin_leadershipauto/makedict/base.json rename to tests/dictionaries/40ifin_leadershipauto/makedict/base.json diff --git a/tests/flattener_dicos/40ifin_leadershipauto/tiramisu/__init__.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/40ifin_leadershipauto/tiramisu/__init__.py rename to tests/dictionaries/40ifin_leadershipauto/tiramisu/__init__.py diff --git a/tests/flattener_dicos/40ifin_leadershipauto/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py similarity index 90% rename from tests/flattener_dicos/40ifin_leadershipauto/tiramisu/base.py rename to tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py index 64e522c4..f789d141 100644 --- a/tests/flattener_dicos/40ifin_leadershipauto/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='condition', multi=False, default='oui', values=('oui', 'non')) option_6 = StrOption(name='leader', doc='leader', multi=True) diff --git a/tests/flattener_dicos/40ifin_multi/00-base.xml b/tests/dictionaries/40ifin_multi/00-base.xml similarity index 100% rename from tests/flattener_dicos/40ifin_multi/00-base.xml rename to tests/dictionaries/40ifin_multi/00-base.xml diff --git a/tests/flattener_dicos/40ifin_multi/__init__.py b/tests/dictionaries/40ifin_multi/__init__.py similarity index 100% rename from tests/flattener_dicos/40ifin_multi/__init__.py rename to tests/dictionaries/40ifin_multi/__init__.py diff --git a/tests/flattener_dicos/40ifin_multi/makedict/base.json b/tests/dictionaries/40ifin_multi/makedict/base.json similarity index 100% rename from tests/flattener_dicos/40ifin_multi/makedict/base.json rename to tests/dictionaries/40ifin_multi/makedict/base.json diff --git a/tests/flattener_dicos/40ifin_multi/tiramisu/__init__.py b/tests/dictionaries/40ifin_multi/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/40ifin_multi/tiramisu/__init__.py rename to tests/dictionaries/40ifin_multi/tiramisu/__init__.py diff --git a/tests/flattener_dicos/40ifin_multi/tiramisu/base.py b/tests/dictionaries/40ifin_multi/tiramisu/base.py similarity index 90% rename from tests/flattener_dicos/40ifin_multi/tiramisu/base.py rename to tests/dictionaries/40ifin_multi/tiramisu/base.py index d185b4e9..8afb6dd5 100644 --- a/tests/flattener_dicos/40ifin_multi/tiramisu/base.py +++ b/tests/dictionaries/40ifin_multi/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/40ifin_validenum/00-base.xml b/tests/dictionaries/40ifin_validenum/00-base.xml similarity index 100% rename from tests/flattener_dicos/40ifin_validenum/00-base.xml rename to tests/dictionaries/40ifin_validenum/00-base.xml diff --git a/tests/flattener_dicos/40ifin_validenum/__init__.py b/tests/dictionaries/40ifin_validenum/__init__.py similarity index 100% rename from tests/flattener_dicos/40ifin_validenum/__init__.py rename to tests/dictionaries/40ifin_validenum/__init__.py diff --git a/tests/flattener_dicos/40ifin_validenum/makedict/base.json b/tests/dictionaries/40ifin_validenum/makedict/base.json similarity index 100% rename from tests/flattener_dicos/40ifin_validenum/makedict/base.json rename to tests/dictionaries/40ifin_validenum/makedict/base.json diff --git a/tests/flattener_dicos/40ifin_validenum/tiramisu/__init__.py b/tests/dictionaries/40ifin_validenum/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/40ifin_validenum/tiramisu/__init__.py rename to tests/dictionaries/40ifin_validenum/tiramisu/__init__.py diff --git a/tests/flattener_dicos/40ifin_validenum/tiramisu/base.py b/tests/dictionaries/40ifin_validenum/tiramisu/base.py similarity index 87% rename from tests/flattener_dicos/40ifin_validenum/tiramisu/base.py rename to tests/dictionaries/40ifin_validenum/tiramisu/base.py index 9d21fbed..ea11621c 100644 --- a/tests/flattener_dicos/40ifin_validenum/tiramisu/base.py +++ b/tests/dictionaries/40ifin_validenum/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_5 = ChoiceOption(properties=frozenset({'disabled', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/50exists_exists/00-base.xml b/tests/dictionaries/50exists_exists/00-base.xml similarity index 100% rename from tests/flattener_dicos/50exists_exists/00-base.xml rename to tests/dictionaries/50exists_exists/00-base.xml diff --git a/tests/flattener_dicos/50exists_exists/01-base.xml b/tests/dictionaries/50exists_exists/01-base.xml similarity index 100% rename from tests/flattener_dicos/50exists_exists/01-base.xml rename to tests/dictionaries/50exists_exists/01-base.xml diff --git a/tests/flattener_dicos/50exists_exists/__init__.py b/tests/dictionaries/50exists_exists/__init__.py similarity index 100% rename from tests/flattener_dicos/50exists_exists/__init__.py rename to tests/dictionaries/50exists_exists/__init__.py diff --git a/tests/flattener_dicos/50exists_exists/makedict/base.json b/tests/dictionaries/50exists_exists/makedict/base.json similarity index 100% rename from tests/flattener_dicos/50exists_exists/makedict/base.json rename to tests/dictionaries/50exists_exists/makedict/base.json diff --git a/tests/flattener_dicos/50exists_exists/tiramisu/__init__.py b/tests/dictionaries/50exists_exists/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/50exists_exists/tiramisu/__init__.py rename to tests/dictionaries/50exists_exists/tiramisu/__init__.py diff --git a/tests/flattener_dicos/50exists_exists/tiramisu/base.py b/tests/dictionaries/50exists_exists/tiramisu/base.py similarity index 80% rename from tests/flattener_dicos/50exists_exists/tiramisu/base.py rename to tests/dictionaries/50exists_exists/tiramisu/base.py index 5e788bc0..28d6035d 100644 --- a/tests/flattener_dicos/50exists_exists/tiramisu/base.py +++ b/tests/dictionaries/50exists_exists/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/50redefine_description/00-base.xml b/tests/dictionaries/50redefine_description/00-base.xml similarity index 100% rename from tests/flattener_dicos/50redefine_description/00-base.xml rename to tests/dictionaries/50redefine_description/00-base.xml diff --git a/tests/flattener_dicos/50redefine_description/01-redefine.xml b/tests/dictionaries/50redefine_description/01-redefine.xml similarity index 100% rename from tests/flattener_dicos/50redefine_description/01-redefine.xml rename to tests/dictionaries/50redefine_description/01-redefine.xml diff --git a/tests/flattener_dicos/50redefine_description/__init__.py b/tests/dictionaries/50redefine_description/__init__.py similarity index 100% rename from tests/flattener_dicos/50redefine_description/__init__.py rename to tests/dictionaries/50redefine_description/__init__.py diff --git a/tests/flattener_dicos/50redefine_description/makedict/base.json b/tests/dictionaries/50redefine_description/makedict/base.json similarity index 100% rename from tests/flattener_dicos/50redefine_description/makedict/base.json rename to tests/dictionaries/50redefine_description/makedict/base.json diff --git a/tests/flattener_dicos/50redefine_description/tiramisu/__init__.py b/tests/dictionaries/50redefine_description/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/50redefine_description/tiramisu/__init__.py rename to tests/dictionaries/50redefine_description/tiramisu/__init__.py diff --git a/tests/flattener_dicos/50redefine_description/tiramisu/base.py b/tests/dictionaries/50redefine_description/tiramisu/base.py similarity index 80% rename from tests/flattener_dicos/50redefine_description/tiramisu/base.py rename to tests/dictionaries/50redefine_description/tiramisu/base.py index b9cc21cb..2181f454 100644 --- a/tests/flattener_dicos/50redefine_description/tiramisu/base.py +++ b/tests/dictionaries/50redefine_description/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Redefined', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/51exists_nonexists/00-base.xml b/tests/dictionaries/51exists_nonexists/00-base.xml similarity index 100% rename from tests/flattener_dicos/51exists_nonexists/00-base.xml rename to tests/dictionaries/51exists_nonexists/00-base.xml diff --git a/tests/flattener_dicos/51exists_nonexists/01-base.xml b/tests/dictionaries/51exists_nonexists/01-base.xml similarity index 100% rename from tests/flattener_dicos/51exists_nonexists/01-base.xml rename to tests/dictionaries/51exists_nonexists/01-base.xml diff --git a/tests/flattener_dicos/51exists_nonexists/__init__.py b/tests/dictionaries/51exists_nonexists/__init__.py similarity index 100% rename from tests/flattener_dicos/51exists_nonexists/__init__.py rename to tests/dictionaries/51exists_nonexists/__init__.py diff --git a/tests/flattener_dicos/51exists_nonexists/makedict/base.json b/tests/dictionaries/51exists_nonexists/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51exists_nonexists/makedict/base.json rename to tests/dictionaries/51exists_nonexists/makedict/base.json diff --git a/tests/flattener_dicos/51exists_nonexists/tiramisu/__init__.py b/tests/dictionaries/51exists_nonexists/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51exists_nonexists/tiramisu/__init__.py rename to tests/dictionaries/51exists_nonexists/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51exists_nonexists/tiramisu/base.py b/tests/dictionaries/51exists_nonexists/tiramisu/base.py similarity index 86% rename from tests/flattener_dicos/51exists_nonexists/tiramisu/base.py rename to tests/dictionaries/51exists_nonexists/tiramisu/base.py index eced71db..9d06935b 100644 --- a/tests/flattener_dicos/51exists_nonexists/tiramisu/base.py +++ b/tests/dictionaries/51exists_nonexists/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='Description', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='New description', multi=False, default='oui', values=('oui', 'non')) diff --git a/tests/flattener_dicos/51redefine_auto/00-base.xml b/tests/dictionaries/51redefine_auto/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_auto/00-base.xml rename to tests/dictionaries/51redefine_auto/00-base.xml diff --git a/tests/flattener_dicos/51redefine_auto/01-base.xml b/tests/dictionaries/51redefine_auto/01-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_auto/01-base.xml rename to tests/dictionaries/51redefine_auto/01-base.xml diff --git a/tests/flattener_dicos/51redefine_auto/__init__.py b/tests/dictionaries/51redefine_auto/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_auto/__init__.py rename to tests/dictionaries/51redefine_auto/__init__.py diff --git a/tests/flattener_dicos/51redefine_auto/makedict/base.json b/tests/dictionaries/51redefine_auto/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51redefine_auto/makedict/base.json rename to tests/dictionaries/51redefine_auto/makedict/base.json diff --git a/tests/flattener_dicos/51redefine_auto/tiramisu/__init__.py b/tests/dictionaries/51redefine_auto/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_auto/tiramisu/__init__.py rename to tests/dictionaries/51redefine_auto/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51redefine_auto/tiramisu/base.py b/tests/dictionaries/51redefine_auto/tiramisu/base.py similarity index 81% rename from tests/flattener_dicos/51redefine_auto/tiramisu/base.py rename to tests/dictionaries/51redefine_auto/tiramisu/base.py index 0a988a6d..7d6ad8fe 100644 --- a/tests/flattener_dicos/51redefine_auto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_auto/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/51redefine_autofill/00-base.xml b/tests/dictionaries/51redefine_autofill/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_autofill/00-base.xml rename to tests/dictionaries/51redefine_autofill/00-base.xml diff --git a/tests/flattener_dicos/51redefine_autofill/01-base.xml b/tests/dictionaries/51redefine_autofill/01-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_autofill/01-base.xml rename to tests/dictionaries/51redefine_autofill/01-base.xml diff --git a/tests/flattener_dicos/51redefine_autofill/__init__.py b/tests/dictionaries/51redefine_autofill/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_autofill/__init__.py rename to tests/dictionaries/51redefine_autofill/__init__.py diff --git a/tests/flattener_dicos/51redefine_autofill/makedict/base.json b/tests/dictionaries/51redefine_autofill/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51redefine_autofill/makedict/base.json rename to tests/dictionaries/51redefine_autofill/makedict/base.json diff --git a/tests/flattener_dicos/51redefine_autofill/tiramisu/__init__.py b/tests/dictionaries/51redefine_autofill/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_autofill/tiramisu/__init__.py rename to tests/dictionaries/51redefine_autofill/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51redefine_autofill/tiramisu/base.py b/tests/dictionaries/51redefine_autofill/tiramisu/base.py similarity index 80% rename from tests/flattener_dicos/51redefine_autofill/tiramisu/base.py rename to tests/dictionaries/51redefine_autofill/tiramisu/base.py index 097be814..633df0c6 100644 --- a/tests/flattener_dicos/51redefine_autofill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_autofill/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/51redefine_family/00-base.xml b/tests/dictionaries/51redefine_family/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_family/00-base.xml rename to tests/dictionaries/51redefine_family/00-base.xml diff --git a/tests/flattener_dicos/51redefine_family/01-base.xml b/tests/dictionaries/51redefine_family/01-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_family/01-base.xml rename to tests/dictionaries/51redefine_family/01-base.xml diff --git a/tests/flattener_dicos/51redefine_family/__init__.py b/tests/dictionaries/51redefine_family/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_family/__init__.py rename to tests/dictionaries/51redefine_family/__init__.py diff --git a/tests/flattener_dicos/51redefine_family/makedict/base.json b/tests/dictionaries/51redefine_family/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51redefine_family/makedict/base.json rename to tests/dictionaries/51redefine_family/makedict/base.json diff --git a/tests/flattener_dicos/51redefine_family/tiramisu/__init__.py b/tests/dictionaries/51redefine_family/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_family/tiramisu/__init__.py rename to tests/dictionaries/51redefine_family/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51redefine_family/tiramisu/base.py b/tests/dictionaries/51redefine_family/tiramisu/base.py similarity index 88% rename from tests/flattener_dicos/51redefine_family/tiramisu/base.py rename to tests/dictionaries/51redefine_family/tiramisu/base.py index 0b4bc4b8..a32b8aaf 100644 --- a/tests/flattener_dicos/51redefine_family/tiramisu/base.py +++ b/tests/dictionaries/51redefine_family/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/51redefine_fill/00-base.xml b/tests/dictionaries/51redefine_fill/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_fill/00-base.xml rename to tests/dictionaries/51redefine_fill/00-base.xml diff --git a/tests/flattener_dicos/51redefine_fill/01-base.xml b/tests/dictionaries/51redefine_fill/01-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_fill/01-base.xml rename to tests/dictionaries/51redefine_fill/01-base.xml diff --git a/tests/flattener_dicos/51redefine_fill/__init__.py b/tests/dictionaries/51redefine_fill/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_fill/__init__.py rename to tests/dictionaries/51redefine_fill/__init__.py diff --git a/tests/flattener_dicos/51redefine_fill/makedict/base.json b/tests/dictionaries/51redefine_fill/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51redefine_fill/makedict/base.json rename to tests/dictionaries/51redefine_fill/makedict/base.json diff --git a/tests/flattener_dicos/51redefine_fill/tiramisu/__init__.py b/tests/dictionaries/51redefine_fill/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_fill/tiramisu/__init__.py rename to tests/dictionaries/51redefine_fill/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51redefine_fill/tiramisu/base.py b/tests/dictionaries/51redefine_fill/tiramisu/base.py similarity index 81% rename from tests/flattener_dicos/51redefine_fill/tiramisu/base.py rename to tests/dictionaries/51redefine_fill/tiramisu/base.py index 0a988a6d..7d6ad8fe 100644 --- a/tests/flattener_dicos/51redefine_fill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fill/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/51redefine_fillauto/00-base.xml b/tests/dictionaries/51redefine_fillauto/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_fillauto/00-base.xml rename to tests/dictionaries/51redefine_fillauto/00-base.xml diff --git a/tests/flattener_dicos/51redefine_fillauto/01-base.xml b/tests/dictionaries/51redefine_fillauto/01-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_fillauto/01-base.xml rename to tests/dictionaries/51redefine_fillauto/01-base.xml diff --git a/tests/flattener_dicos/51redefine_fillauto/__init__.py b/tests/dictionaries/51redefine_fillauto/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_fillauto/__init__.py rename to tests/dictionaries/51redefine_fillauto/__init__.py diff --git a/tests/flattener_dicos/51redefine_fillauto/makedict/base.json b/tests/dictionaries/51redefine_fillauto/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51redefine_fillauto/makedict/base.json rename to tests/dictionaries/51redefine_fillauto/makedict/base.json diff --git a/tests/flattener_dicos/51redefine_fillauto/tiramisu/__init__.py b/tests/dictionaries/51redefine_fillauto/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_fillauto/tiramisu/__init__.py rename to tests/dictionaries/51redefine_fillauto/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51redefine_fillauto/tiramisu/base.py b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py similarity index 81% rename from tests/flattener_dicos/51redefine_fillauto/tiramisu/base.py rename to tests/dictionaries/51redefine_fillauto/tiramisu/base.py index 0a988a6d..7d6ad8fe 100644 --- a/tests/flattener_dicos/51redefine_fillauto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/51redefine_help/00-base.xml b/tests/dictionaries/51redefine_help/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_help/00-base.xml rename to tests/dictionaries/51redefine_help/00-base.xml diff --git a/tests/flattener_dicos/51redefine_help/01-base.xml b/tests/dictionaries/51redefine_help/01-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_help/01-base.xml rename to tests/dictionaries/51redefine_help/01-base.xml diff --git a/tests/flattener_dicos/51redefine_help/__init__.py b/tests/dictionaries/51redefine_help/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_help/__init__.py rename to tests/dictionaries/51redefine_help/__init__.py diff --git a/tests/flattener_dicos/51redefine_help/makedict/base.json b/tests/dictionaries/51redefine_help/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51redefine_help/makedict/base.json rename to tests/dictionaries/51redefine_help/makedict/base.json diff --git a/tests/flattener_dicos/51redefine_help/tiramisu/__init__.py b/tests/dictionaries/51redefine_help/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_help/tiramisu/__init__.py rename to tests/dictionaries/51redefine_help/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51redefine_help/tiramisu/base.py b/tests/dictionaries/51redefine_help/tiramisu/base.py similarity index 83% rename from tests/flattener_dicos/51redefine_help/tiramisu/base.py rename to tests/dictionaries/51redefine_help/tiramisu/base.py index 47cee715..0d37ca12 100644 --- a/tests/flattener_dicos/51redefine_help/tiramisu/base.py +++ b/tests/dictionaries/51redefine_help/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='redefine help', multi=False, default='non', values=('oui', 'non')) option_3.impl_set_information("help", "redefine help ok") option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) diff --git a/tests/flattener_dicos/51redefine_hidden/00-base.xml b/tests/dictionaries/51redefine_hidden/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_hidden/00-base.xml rename to tests/dictionaries/51redefine_hidden/00-base.xml diff --git a/tests/flattener_dicos/51redefine_hidden/01-redefine.xml b/tests/dictionaries/51redefine_hidden/01-redefine.xml similarity index 100% rename from tests/flattener_dicos/51redefine_hidden/01-redefine.xml rename to tests/dictionaries/51redefine_hidden/01-redefine.xml diff --git a/tests/flattener_dicos/51redefine_hidden/__init__.py b/tests/dictionaries/51redefine_hidden/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_hidden/__init__.py rename to tests/dictionaries/51redefine_hidden/__init__.py diff --git a/tests/flattener_dicos/51redefine_hidden/makedict/base.json b/tests/dictionaries/51redefine_hidden/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51redefine_hidden/makedict/base.json rename to tests/dictionaries/51redefine_hidden/makedict/base.json diff --git a/tests/flattener_dicos/51redefine_hidden/tiramisu/__init__.py b/tests/dictionaries/51redefine_hidden/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_hidden/tiramisu/__init__.py rename to tests/dictionaries/51redefine_hidden/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51redefine_hidden/tiramisu/base.py b/tests/dictionaries/51redefine_hidden/tiramisu/base.py similarity index 80% rename from tests/flattener_dicos/51redefine_hidden/tiramisu/base.py rename to tests/dictionaries/51redefine_hidden/tiramisu/base.py index eb6af18f..e821fad7 100644 --- a/tests/flattener_dicos/51redefine_hidden/tiramisu/base.py +++ b/tests/dictionaries/51redefine_hidden/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Redefine hidden', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/51redefine_multi/00-base.xml b/tests/dictionaries/51redefine_multi/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_multi/00-base.xml rename to tests/dictionaries/51redefine_multi/00-base.xml diff --git a/tests/flattener_dicos/51redefine_multi/01-redefine.xml b/tests/dictionaries/51redefine_multi/01-redefine.xml similarity index 100% rename from tests/flattener_dicos/51redefine_multi/01-redefine.xml rename to tests/dictionaries/51redefine_multi/01-redefine.xml diff --git a/tests/flattener_dicos/51redefine_multi/__init__.py b/tests/dictionaries/51redefine_multi/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_multi/__init__.py rename to tests/dictionaries/51redefine_multi/__init__.py diff --git a/tests/flattener_dicos/51redefine_remove_check/00-base.xml b/tests/dictionaries/51redefine_remove_check/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_remove_check/00-base.xml rename to tests/dictionaries/51redefine_remove_check/00-base.xml diff --git a/tests/flattener_dicos/51redefine_remove_check/01-base.xml b/tests/dictionaries/51redefine_remove_check/01-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_remove_check/01-base.xml rename to tests/dictionaries/51redefine_remove_check/01-base.xml diff --git a/tests/flattener_dicos/51redefine_remove_check/__init__.py b/tests/dictionaries/51redefine_remove_check/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_remove_check/__init__.py rename to tests/dictionaries/51redefine_remove_check/__init__.py diff --git a/tests/flattener_dicos/51redefine_remove_check/makedict/base.json b/tests/dictionaries/51redefine_remove_check/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51redefine_remove_check/makedict/base.json rename to tests/dictionaries/51redefine_remove_check/makedict/base.json diff --git a/tests/flattener_dicos/51redefine_remove_check/tiramisu/__init__.py b/tests/dictionaries/51redefine_remove_check/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_remove_check/tiramisu/__init__.py rename to tests/dictionaries/51redefine_remove_check/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51redefine_remove_check/tiramisu/base.py b/tests/dictionaries/51redefine_remove_check/tiramisu/base.py similarity index 79% rename from tests/flattener_dicos/51redefine_remove_check/tiramisu/base.py rename to tests/dictionaries/51redefine_remove_check/tiramisu/base.py index 994a4a43..2dd59246 100644 --- a/tests/flattener_dicos/51redefine_remove_check/tiramisu/base.py +++ b/tests/dictionaries/51redefine_remove_check/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/51redefine_remove_condition/00-base.xml b/tests/dictionaries/51redefine_remove_condition/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_remove_condition/00-base.xml rename to tests/dictionaries/51redefine_remove_condition/00-base.xml diff --git a/tests/flattener_dicos/51redefine_remove_condition/01-base.xml b/tests/dictionaries/51redefine_remove_condition/01-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_remove_condition/01-base.xml rename to tests/dictionaries/51redefine_remove_condition/01-base.xml diff --git a/tests/flattener_dicos/51redefine_remove_condition/__init__.py b/tests/dictionaries/51redefine_remove_condition/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_remove_condition/__init__.py rename to tests/dictionaries/51redefine_remove_condition/__init__.py diff --git a/tests/flattener_dicos/51redefine_remove_condition/makedict/base.json b/tests/dictionaries/51redefine_remove_condition/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51redefine_remove_condition/makedict/base.json rename to tests/dictionaries/51redefine_remove_condition/makedict/base.json diff --git a/tests/flattener_dicos/51redefine_remove_condition/tiramisu/__init__.py b/tests/dictionaries/51redefine_remove_condition/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_remove_condition/tiramisu/__init__.py rename to tests/dictionaries/51redefine_remove_condition/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51redefine_remove_condition/tiramisu/base.py b/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/51redefine_remove_condition/tiramisu/base.py rename to tests/dictionaries/51redefine_remove_condition/tiramisu/base.py index 900e1896..01573329 100644 --- a/tests/flattener_dicos/51redefine_remove_condition/tiramisu/base.py +++ b/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/51redefine_removecondition_alltarget/00-base.xml b/tests/dictionaries/51redefine_removecondition_alltarget/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_removecondition_alltarget/00-base.xml rename to tests/dictionaries/51redefine_removecondition_alltarget/00-base.xml diff --git a/tests/flattener_dicos/51redefine_removecondition_alltarget/01-base.xml b/tests/dictionaries/51redefine_removecondition_alltarget/01-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_removecondition_alltarget/01-base.xml rename to tests/dictionaries/51redefine_removecondition_alltarget/01-base.xml diff --git a/tests/flattener_dicos/51redefine_removecondition_alltarget/__init__.py b/tests/dictionaries/51redefine_removecondition_alltarget/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_removecondition_alltarget/__init__.py rename to tests/dictionaries/51redefine_removecondition_alltarget/__init__.py diff --git a/tests/flattener_dicos/51redefine_removecondition_alltarget/makedict/base.json b/tests/dictionaries/51redefine_removecondition_alltarget/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51redefine_removecondition_alltarget/makedict/base.json rename to tests/dictionaries/51redefine_removecondition_alltarget/makedict/base.json diff --git a/tests/flattener_dicos/51redefine_removecondition_alltarget/tiramisu/__init__.py b/tests/dictionaries/51redefine_removecondition_alltarget/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_removecondition_alltarget/tiramisu/__init__.py rename to tests/dictionaries/51redefine_removecondition_alltarget/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51redefine_removecondition_alltarget/tiramisu/base.py b/tests/dictionaries/51redefine_removecondition_alltarget/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/51redefine_removecondition_alltarget/tiramisu/base.py rename to tests/dictionaries/51redefine_removecondition_alltarget/tiramisu/base.py index 8fe884ed..83c1759d 100644 --- a/tests/flattener_dicos/51redefine_removecondition_alltarget/tiramisu/base.py +++ b/tests/dictionaries/51redefine_removecondition_alltarget/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/00-base.xml b/tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_removecondition_nonautofreeze/00-base.xml rename to tests/dictionaries/51redefine_removecondition_nonautofreeze/00-base.xml diff --git a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/01-base.xml b/tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_removecondition_nonautofreeze/01-base.xml rename to tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml diff --git a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/__init__.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_removecondition_nonautofreeze/__init__.py rename to tests/dictionaries/51redefine_removecondition_nonautofreeze/__init__.py diff --git a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/makedict/base.json b/tests/dictionaries/51redefine_removecondition_nonautofreeze/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51redefine_removecondition_nonautofreeze/makedict/base.json rename to tests/dictionaries/51redefine_removecondition_nonautofreeze/makedict/base.json diff --git a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/tiramisu/__init__.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_removecondition_nonautofreeze/tiramisu/__init__.py rename to tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/tiramisu/base.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/51redefine_removecondition_nonautofreeze/tiramisu/base.py rename to tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py index 159df35d..10e02322 100644 --- a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/tiramisu/base.py +++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_7 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3 = ChoiceOption(properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/51redefine_type/00-base.xml b/tests/dictionaries/51redefine_type/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_type/00-base.xml rename to tests/dictionaries/51redefine_type/00-base.xml diff --git a/tests/flattener_dicos/51redefine_type/01-redefine.xml b/tests/dictionaries/51redefine_type/01-redefine.xml similarity index 100% rename from tests/flattener_dicos/51redefine_type/01-redefine.xml rename to tests/dictionaries/51redefine_type/01-redefine.xml diff --git a/tests/flattener_dicos/51redefine_type/__init__.py b/tests/dictionaries/51redefine_type/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_type/__init__.py rename to tests/dictionaries/51redefine_type/__init__.py diff --git a/tests/flattener_dicos/51redefine_validenum/00-base.xml b/tests/dictionaries/51redefine_validenum/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_validenum/00-base.xml rename to tests/dictionaries/51redefine_validenum/00-base.xml diff --git a/tests/flattener_dicos/51redefine_validenum/01-redefine.xml b/tests/dictionaries/51redefine_validenum/01-redefine.xml similarity index 100% rename from tests/flattener_dicos/51redefine_validenum/01-redefine.xml rename to tests/dictionaries/51redefine_validenum/01-redefine.xml diff --git a/tests/flattener_dicos/51redefine_validenum/__init__.py b/tests/dictionaries/51redefine_validenum/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_validenum/__init__.py rename to tests/dictionaries/51redefine_validenum/__init__.py diff --git a/tests/flattener_dicos/51redefine_validenum/makedict/base.json b/tests/dictionaries/51redefine_validenum/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51redefine_validenum/makedict/base.json rename to tests/dictionaries/51redefine_validenum/makedict/base.json diff --git a/tests/flattener_dicos/51redefine_validenum/tiramisu/__init__.py b/tests/dictionaries/51redefine_validenum/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_validenum/tiramisu/__init__.py rename to tests/dictionaries/51redefine_validenum/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51redefine_validenum/tiramisu/base.py b/tests/dictionaries/51redefine_validenum/tiramisu/base.py similarity index 80% rename from tests/flattener_dicos/51redefine_validenum/tiramisu/base.py rename to tests/dictionaries/51redefine_validenum/tiramisu/base.py index a377f174..9d9bf3c8 100644 --- a/tests/flattener_dicos/51redefine_validenum/tiramisu/base.py +++ b/tests/dictionaries/51redefine_validenum/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Redefine description', multi=False, default='a', values=('a', 'b')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/51redefine_value/00-base.xml b/tests/dictionaries/51redefine_value/00-base.xml similarity index 100% rename from tests/flattener_dicos/51redefine_value/00-base.xml rename to tests/dictionaries/51redefine_value/00-base.xml diff --git a/tests/flattener_dicos/51redefine_value/01-redefine.xml b/tests/dictionaries/51redefine_value/01-redefine.xml similarity index 100% rename from tests/flattener_dicos/51redefine_value/01-redefine.xml rename to tests/dictionaries/51redefine_value/01-redefine.xml diff --git a/tests/flattener_dicos/51redefine_value/__init__.py b/tests/dictionaries/51redefine_value/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_value/__init__.py rename to tests/dictionaries/51redefine_value/__init__.py diff --git a/tests/flattener_dicos/51redefine_value/makedict/base.json b/tests/dictionaries/51redefine_value/makedict/base.json similarity index 100% rename from tests/flattener_dicos/51redefine_value/makedict/base.json rename to tests/dictionaries/51redefine_value/makedict/base.json diff --git a/tests/flattener_dicos/51redefine_value/tiramisu/__init__.py b/tests/dictionaries/51redefine_value/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/51redefine_value/tiramisu/__init__.py rename to tests/dictionaries/51redefine_value/tiramisu/__init__.py diff --git a/tests/flattener_dicos/51redefine_value/tiramisu/base.py b/tests/dictionaries/51redefine_value/tiramisu/base.py similarity index 84% rename from tests/flattener_dicos/51redefine_value/tiramisu/base.py rename to tests/dictionaries/51redefine_value/tiramisu/base.py index cb602612..a0770820 100644 --- a/tests/flattener_dicos/51redefine_value/tiramisu/base.py +++ b/tests/dictionaries/51redefine_value/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Redefine value', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='Redefine value', multi=False, default='oui', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/52exists_redefine/00-base.xml b/tests/dictionaries/52exists_redefine/00-base.xml similarity index 100% rename from tests/flattener_dicos/52exists_redefine/00-base.xml rename to tests/dictionaries/52exists_redefine/00-base.xml diff --git a/tests/flattener_dicos/52exists_redefine/01-base.xml b/tests/dictionaries/52exists_redefine/01-base.xml similarity index 100% rename from tests/flattener_dicos/52exists_redefine/01-base.xml rename to tests/dictionaries/52exists_redefine/01-base.xml diff --git a/tests/flattener_dicos/52exists_redefine/__init__.py b/tests/dictionaries/52exists_redefine/__init__.py similarity index 100% rename from tests/flattener_dicos/52exists_redefine/__init__.py rename to tests/dictionaries/52exists_redefine/__init__.py diff --git a/tests/flattener_dicos/52exists_redefine/makedict/base.json b/tests/dictionaries/52exists_redefine/makedict/base.json similarity index 100% rename from tests/flattener_dicos/52exists_redefine/makedict/base.json rename to tests/dictionaries/52exists_redefine/makedict/base.json diff --git a/tests/flattener_dicos/52exists_redefine/tiramisu/__init__.py b/tests/dictionaries/52exists_redefine/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/52exists_redefine/tiramisu/__init__.py rename to tests/dictionaries/52exists_redefine/tiramisu/__init__.py diff --git a/tests/flattener_dicos/52exists_redefine/tiramisu/base.py b/tests/dictionaries/52exists_redefine/tiramisu/base.py similarity index 80% rename from tests/flattener_dicos/52exists_redefine/tiramisu/base.py rename to tests/dictionaries/52exists_redefine/tiramisu/base.py index 1e6be002..d2979842 100644 --- a/tests/flattener_dicos/52exists_redefine/tiramisu/base.py +++ b/tests/dictionaries/52exists_redefine/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='New description', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/60action_external/00-base.xml b/tests/dictionaries/60action_external/00-base.xml similarity index 100% rename from tests/flattener_dicos/60action_external/00-base.xml rename to tests/dictionaries/60action_external/00-base.xml diff --git a/tests/flattener_dicos/60action_external/__init__.py b/tests/dictionaries/60action_external/__init__.py similarity index 100% rename from tests/flattener_dicos/60action_external/__init__.py rename to tests/dictionaries/60action_external/__init__.py diff --git a/tests/flattener_dicos/60action_external/extra_dirs/extra/00-base.xml b/tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60action_external/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60action_external/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60action_external/makedict/base.json b/tests/dictionaries/60action_external/makedict/base.json similarity index 100% rename from tests/flattener_dicos/60action_external/makedict/base.json rename to tests/dictionaries/60action_external/makedict/base.json diff --git a/tests/flattener_dicos/60action_external/tiramisu/__init__.py b/tests/dictionaries/60action_external/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/60action_external/tiramisu/__init__.py rename to tests/dictionaries/60action_external/tiramisu/__init__.py diff --git a/tests/flattener_dicos/60action_external/tiramisu/base.py b/tests/dictionaries/60action_external/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/60action_external/tiramisu/base.py rename to tests/dictionaries/60action_external/tiramisu/base.py index bd799ffc..fe33ac79 100644 --- a/tests/flattener_dicos/60action_external/tiramisu/base.py +++ b/tests/dictionaries/60action_external/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/60extra_externalspace/00-base.xml b/tests/dictionaries/60extra_externalspace/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspace/00-base.xml rename to tests/dictionaries/60extra_externalspace/00-base.xml diff --git a/tests/flattener_dicos/60extra_externalspace/__init__.py b/tests/dictionaries/60extra_externalspace/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_externalspace/__init__.py rename to tests/dictionaries/60extra_externalspace/__init__.py diff --git a/tests/flattener_dicos/60extra_externalspace/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_externalspace/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspace/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60extra_externalspace/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60extra_externalspace/extra_dirs/extra1/00-base.xml b/tests/dictionaries/60extra_externalspace/extra_dirs/extra1/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspace/extra_dirs/extra1/00-base.xml rename to tests/dictionaries/60extra_externalspace/extra_dirs/extra1/00-base.xml diff --git a/tests/flattener_dicos/60extra_externalspaceauto/00-base.xml b/tests/dictionaries/60extra_externalspaceauto/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspaceauto/00-base.xml rename to tests/dictionaries/60extra_externalspaceauto/00-base.xml diff --git a/tests/flattener_dicos/60extra_externalspaceauto/__init__.py b/tests/dictionaries/60extra_externalspaceauto/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_externalspaceauto/__init__.py rename to tests/dictionaries/60extra_externalspaceauto/__init__.py diff --git a/tests/flattener_dicos/60extra_externalspaceauto/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_externalspaceauto/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspaceauto/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60extra_externalspaceauto/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60extra_externalspaceauto/extra_dirs/extra1/00-base.xml b/tests/dictionaries/60extra_externalspaceauto/extra_dirs/extra1/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspaceauto/extra_dirs/extra1/00-base.xml rename to tests/dictionaries/60extra_externalspaceauto/extra_dirs/extra1/00-base.xml diff --git a/tests/flattener_dicos/60extra_externalspacecondition/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspacecondition/00-base.xml rename to tests/dictionaries/60extra_externalspacecondition/00-base.xml diff --git a/tests/flattener_dicos/60extra_externalspacecondition/__init__.py b/tests/dictionaries/60extra_externalspacecondition/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_externalspacecondition/__init__.py rename to tests/dictionaries/60extra_externalspacecondition/__init__.py diff --git a/tests/flattener_dicos/60extra_externalspacecondition/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspacecondition/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml b/tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml rename to tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra1/00-base.xml diff --git a/tests/flattener_dicos/60extra_externalspacecondition/makedict/base.json b/tests/dictionaries/60extra_externalspacecondition/makedict/base.json similarity index 100% rename from tests/flattener_dicos/60extra_externalspacecondition/makedict/base.json rename to tests/dictionaries/60extra_externalspacecondition/makedict/base.json diff --git a/tests/flattener_dicos/60extra_externalspacecondition/tiramisu/__init__.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_externalspacecondition/tiramisu/__init__.py rename to tests/dictionaries/60extra_externalspacecondition/tiramisu/__init__.py diff --git a/tests/flattener_dicos/60extra_externalspacecondition/tiramisu/base.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py similarity index 94% rename from tests/flattener_dicos/60extra_externalspacecondition/tiramisu/base.py rename to tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py index b7440531..e47255da 100644 --- a/tests/flattener_dicos/60extra_externalspacecondition/tiramisu/base.py +++ b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non', values=('oui', 'non')) option_3 = ChoiceOption(properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non', values=('oui', 'non')) diff --git a/tests/flattener_dicos/60extra_externalspacecondition2/00-base.xml b/tests/dictionaries/60extra_externalspacecondition2/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspacecondition2/00-base.xml rename to tests/dictionaries/60extra_externalspacecondition2/00-base.xml diff --git a/tests/flattener_dicos/60extra_externalspacecondition2/__init__.py b/tests/dictionaries/60extra_externalspacecondition2/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_externalspacecondition2/__init__.py rename to tests/dictionaries/60extra_externalspacecondition2/__init__.py diff --git a/tests/flattener_dicos/60extra_externalspacecondition2/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_externalspacecondition2/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspacecondition2/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60extra_externalspacecondition2/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60extra_externalspacecondition2/extra_dirs/extra1/00-base.xml b/tests/dictionaries/60extra_externalspacecondition2/extra_dirs/extra1/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspacecondition2/extra_dirs/extra1/00-base.xml rename to tests/dictionaries/60extra_externalspacecondition2/extra_dirs/extra1/00-base.xml diff --git a/tests/flattener_dicos/60extra_externalspacecondition3/00-base.xml b/tests/dictionaries/60extra_externalspacecondition3/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspacecondition3/00-base.xml rename to tests/dictionaries/60extra_externalspacecondition3/00-base.xml diff --git a/tests/flattener_dicos/60extra_externalspacecondition3/__init__.py b/tests/dictionaries/60extra_externalspacecondition3/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_externalspacecondition3/__init__.py rename to tests/dictionaries/60extra_externalspacecondition3/__init__.py diff --git a/tests/flattener_dicos/60extra_externalspacecondition3/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_externalspacecondition3/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_externalspacecondition3/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60extra_externalspacecondition3/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60extra_group/00-base.xml b/tests/dictionaries/60extra_group/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_group/00-base.xml rename to tests/dictionaries/60extra_group/00-base.xml diff --git a/tests/flattener_dicos/60extra_group/__init__.py b/tests/dictionaries/60extra_group/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_group/__init__.py rename to tests/dictionaries/60extra_group/__init__.py diff --git a/tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60extra_group/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60extra_group/makedict/base.json b/tests/dictionaries/60extra_group/makedict/base.json similarity index 100% rename from tests/flattener_dicos/60extra_group/makedict/base.json rename to tests/dictionaries/60extra_group/makedict/base.json diff --git a/tests/templates/60extra_group/result/etc/mailname b/tests/dictionaries/60extra_group/result/etc/mailname similarity index 100% rename from tests/templates/60extra_group/result/etc/mailname rename to tests/dictionaries/60extra_group/result/etc/mailname diff --git a/tests/flattener_dicos/60extra_group/tiramisu/__init__.py b/tests/dictionaries/60extra_group/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_group/tiramisu/__init__.py rename to tests/dictionaries/60extra_group/tiramisu/__init__.py diff --git a/tests/flattener_dicos/60extra_group/tiramisu/base.py b/tests/dictionaries/60extra_group/tiramisu/base.py similarity index 94% rename from tests/flattener_dicos/60extra_group/tiramisu/base.py rename to tests/dictionaries/60extra_group/tiramisu/base.py index d25b3e62..ac6e938c 100644 --- a/tests/flattener_dicos/60extra_group/tiramisu/base.py +++ b/tests/dictionaries/60extra_group/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/templates/60extra_group/tmpl/mailname b/tests/dictionaries/60extra_group/tmpl/mailname similarity index 100% rename from tests/templates/60extra_group/tmpl/mailname rename to tests/dictionaries/60extra_group/tmpl/mailname diff --git a/tests/flattener_dicos/60extra_help/00-base.xml b/tests/dictionaries/60extra_help/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_help/00-base.xml rename to tests/dictionaries/60extra_help/00-base.xml diff --git a/tests/flattener_dicos/60extra_help/__init__.py b/tests/dictionaries/60extra_help/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_help/__init__.py rename to tests/dictionaries/60extra_help/__init__.py diff --git a/tests/flattener_dicos/60extra_help/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_help/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60extra_help/makedict/base.json b/tests/dictionaries/60extra_help/makedict/base.json similarity index 100% rename from tests/flattener_dicos/60extra_help/makedict/base.json rename to tests/dictionaries/60extra_help/makedict/base.json diff --git a/tests/flattener_dicos/60extra_help/tiramisu/__init__.py b/tests/dictionaries/60extra_help/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_help/tiramisu/__init__.py rename to tests/dictionaries/60extra_help/tiramisu/__init__.py diff --git a/tests/flattener_dicos/60extra_help/tiramisu/base.py b/tests/dictionaries/60extra_help/tiramisu/base.py similarity index 95% rename from tests/flattener_dicos/60extra_help/tiramisu/base.py rename to tests/dictionaries/60extra_help/tiramisu/base.py index 0e0d6bcb..3a52bb30 100644 --- a/tests/flattener_dicos/60extra_help/tiramisu/base.py +++ b/tests/dictionaries/60extra_help/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/60extra_load/00-base.xml b/tests/dictionaries/60extra_load/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_load/00-base.xml rename to tests/dictionaries/60extra_load/00-base.xml diff --git a/tests/flattener_dicos/60extra_load/__init__.py b/tests/dictionaries/60extra_load/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_load/__init__.py rename to tests/dictionaries/60extra_load/__init__.py diff --git a/tests/flattener_dicos/60extra_load/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_load/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60extra_load/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60extra_load/makedict/base.json b/tests/dictionaries/60extra_load/makedict/base.json similarity index 100% rename from tests/flattener_dicos/60extra_load/makedict/base.json rename to tests/dictionaries/60extra_load/makedict/base.json diff --git a/tests/flattener_dicos/60extra_load/tiramisu/__init__.py b/tests/dictionaries/60extra_load/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_load/tiramisu/__init__.py rename to tests/dictionaries/60extra_load/tiramisu/__init__.py diff --git a/tests/flattener_dicos/60extra_load/tiramisu/base.py b/tests/dictionaries/60extra_load/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/60extra_load/tiramisu/base.py rename to tests/dictionaries/60extra_load/tiramisu/base.py index 19dfd32b..614ae51d 100644 --- a/tests/flattener_dicos/60extra_load/tiramisu/base.py +++ b/tests/dictionaries/60extra_load/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/60extra_mandatory/00-base.xml b/tests/dictionaries/60extra_mandatory/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_mandatory/00-base.xml rename to tests/dictionaries/60extra_mandatory/00-base.xml diff --git a/tests/flattener_dicos/60extra_mandatory/__init__.py b/tests/dictionaries/60extra_mandatory/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_mandatory/__init__.py rename to tests/dictionaries/60extra_mandatory/__init__.py diff --git a/tests/flattener_dicos/60extra_mandatory/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_mandatory/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60extra_mandatory/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60extra_mandatory/makedict/base.json b/tests/dictionaries/60extra_mandatory/makedict/base.json similarity index 100% rename from tests/flattener_dicos/60extra_mandatory/makedict/base.json rename to tests/dictionaries/60extra_mandatory/makedict/base.json diff --git a/tests/flattener_dicos/60extra_mandatory/tiramisu/__init__.py b/tests/dictionaries/60extra_mandatory/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_mandatory/tiramisu/__init__.py rename to tests/dictionaries/60extra_mandatory/tiramisu/__init__.py diff --git a/tests/flattener_dicos/60extra_mandatory/tiramisu/base.py b/tests/dictionaries/60extra_mandatory/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/60extra_mandatory/tiramisu/base.py rename to tests/dictionaries/60extra_mandatory/tiramisu/base.py index d1edad0b..6fa684cc 100644 --- a/tests/flattener_dicos/60extra_mandatory/tiramisu/base.py +++ b/tests/dictionaries/60extra_mandatory/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/60extra_redefine/00-base.xml b/tests/dictionaries/60extra_redefine/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_redefine/00-base.xml rename to tests/dictionaries/60extra_redefine/00-base.xml diff --git a/tests/flattener_dicos/60extra_redefine/__init__.py b/tests/dictionaries/60extra_redefine/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_redefine/__init__.py rename to tests/dictionaries/60extra_redefine/__init__.py diff --git a/tests/flattener_dicos/60extra_redefine/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_redefine/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60extra_redefine/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60extra_redefine/extra_dirs/extra/01-redefine.xml b/tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml similarity index 100% rename from tests/flattener_dicos/60extra_redefine/extra_dirs/extra/01-redefine.xml rename to tests/dictionaries/60extra_redefine/extra_dirs/extra/01-redefine.xml diff --git a/tests/flattener_dicos/60extra_redefine/makedict/base.json b/tests/dictionaries/60extra_redefine/makedict/base.json similarity index 100% rename from tests/flattener_dicos/60extra_redefine/makedict/base.json rename to tests/dictionaries/60extra_redefine/makedict/base.json diff --git a/tests/flattener_dicos/60extra_redefine/tiramisu/__init__.py b/tests/dictionaries/60extra_redefine/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_redefine/tiramisu/__init__.py rename to tests/dictionaries/60extra_redefine/tiramisu/__init__.py diff --git a/tests/flattener_dicos/60extra_redefine/tiramisu/base.py b/tests/dictionaries/60extra_redefine/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/60extra_redefine/tiramisu/base.py rename to tests/dictionaries/60extra_redefine/tiramisu/base.py index bce0858f..cb9a21a5 100644 --- a/tests/flattener_dicos/60extra_redefine/tiramisu/base.py +++ b/tests/dictionaries/60extra_redefine/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/60extra_separators/00-base.xml b/tests/dictionaries/60extra_separators/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_separators/00-base.xml rename to tests/dictionaries/60extra_separators/00-base.xml diff --git a/tests/flattener_dicos/60extra_separators/__init__.py b/tests/dictionaries/60extra_separators/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_separators/__init__.py rename to tests/dictionaries/60extra_separators/__init__.py diff --git a/tests/flattener_dicos/60extra_separators/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_separators/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60extra_separators/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60extra_separators/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60extra_separators/makedict/base.json b/tests/dictionaries/60extra_separators/makedict/base.json similarity index 100% rename from tests/flattener_dicos/60extra_separators/makedict/base.json rename to tests/dictionaries/60extra_separators/makedict/base.json diff --git a/tests/flattener_dicos/60extra_separators/tiramisu/__init__.py b/tests/dictionaries/60extra_separators/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/60extra_separators/tiramisu/__init__.py rename to tests/dictionaries/60extra_separators/tiramisu/__init__.py diff --git a/tests/flattener_dicos/60extra_separators/tiramisu/base.py b/tests/dictionaries/60extra_separators/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/60extra_separators/tiramisu/base.py rename to tests/dictionaries/60extra_separators/tiramisu/base.py index 8408bdc1..ca8fe373 100644 --- a/tests/flattener_dicos/60extra_separators/tiramisu/base.py +++ b/tests/dictionaries/60extra_separators/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/60familyaction/00-base.xml b/tests/dictionaries/60familyaction/00-base.xml similarity index 100% rename from tests/flattener_dicos/60familyaction/00-base.xml rename to tests/dictionaries/60familyaction/00-base.xml diff --git a/tests/flattener_dicos/60familyaction/__init__.py b/tests/dictionaries/60familyaction/__init__.py similarity index 100% rename from tests/flattener_dicos/60familyaction/__init__.py rename to tests/dictionaries/60familyaction/__init__.py diff --git a/tests/flattener_dicos/60familyaction/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60familyaction/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60familyaction/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60familyaction/makedict/base.json b/tests/dictionaries/60familyaction/makedict/base.json similarity index 100% rename from tests/flattener_dicos/60familyaction/makedict/base.json rename to tests/dictionaries/60familyaction/makedict/base.json diff --git a/tests/flattener_dicos/60familyaction/tiramisu/__init__.py b/tests/dictionaries/60familyaction/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/60familyaction/tiramisu/__init__.py rename to tests/dictionaries/60familyaction/tiramisu/__init__.py diff --git a/tests/flattener_dicos/60familyaction_accent/tiramisu/base.py b/tests/dictionaries/60familyaction/tiramisu/base.py similarity index 86% rename from tests/flattener_dicos/60familyaction_accent/tiramisu/base.py rename to tests/dictionaries/60familyaction/tiramisu/base.py index e789442c..bc31e3a2 100644 --- a/tests/flattener_dicos/60familyaction_accent/tiramisu/base.py +++ b/tests/dictionaries/60familyaction/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/60familyaction_accent/00-base.xml b/tests/dictionaries/60familyaction_accent/00-base.xml similarity index 100% rename from tests/flattener_dicos/60familyaction_accent/00-base.xml rename to tests/dictionaries/60familyaction_accent/00-base.xml diff --git a/tests/flattener_dicos/60familyaction_accent/__init__.py b/tests/dictionaries/60familyaction_accent/__init__.py similarity index 100% rename from tests/flattener_dicos/60familyaction_accent/__init__.py rename to tests/dictionaries/60familyaction_accent/__init__.py diff --git a/tests/flattener_dicos/60familyaction_accent/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction_accent/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60familyaction_accent/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60familyaction_accent/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60familyaction_accent/makedict/base.json b/tests/dictionaries/60familyaction_accent/makedict/base.json similarity index 100% rename from tests/flattener_dicos/60familyaction_accent/makedict/base.json rename to tests/dictionaries/60familyaction_accent/makedict/base.json diff --git a/tests/flattener_dicos/60familyaction_accent/tiramisu/__init__.py b/tests/dictionaries/60familyaction_accent/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/60familyaction_accent/tiramisu/__init__.py rename to tests/dictionaries/60familyaction_accent/tiramisu/__init__.py diff --git a/tests/flattener_dicos/60familyaction/tiramisu/base.py b/tests/dictionaries/60familyaction_accent/tiramisu/base.py similarity index 86% rename from tests/flattener_dicos/60familyaction/tiramisu/base.py rename to tests/dictionaries/60familyaction_accent/tiramisu/base.py index e789442c..bc31e3a2 100644 --- a/tests/flattener_dicos/60familyaction/tiramisu/base.py +++ b/tests/dictionaries/60familyaction_accent/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/60familyaction_mandatory/00-base.xml b/tests/dictionaries/60familyaction_mandatory/00-base.xml similarity index 100% rename from tests/flattener_dicos/60familyaction_mandatory/00-base.xml rename to tests/dictionaries/60familyaction_mandatory/00-base.xml diff --git a/tests/flattener_dicos/60familyaction_mandatory/60familyaction/00-base.xml b/tests/dictionaries/60familyaction_mandatory/60familyaction/00-base.xml similarity index 100% rename from tests/flattener_dicos/60familyaction_mandatory/60familyaction/00-base.xml rename to tests/dictionaries/60familyaction_mandatory/60familyaction/00-base.xml diff --git a/tests/flattener_dicos/60familyaction_mandatory/60familyaction/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction_mandatory/60familyaction/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60familyaction_mandatory/60familyaction/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60familyaction_mandatory/60familyaction/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60familyaction_mandatory/60familyaction/result/00-base.xml b/tests/dictionaries/60familyaction_mandatory/60familyaction/result/00-base.xml similarity index 100% rename from tests/flattener_dicos/60familyaction_mandatory/60familyaction/result/00-base.xml rename to tests/dictionaries/60familyaction_mandatory/60familyaction/result/00-base.xml diff --git a/tests/flattener_dicos/60familyaction_mandatory/__init__.py b/tests/dictionaries/60familyaction_mandatory/__init__.py similarity index 100% rename from tests/flattener_dicos/60familyaction_mandatory/__init__.py rename to tests/dictionaries/60familyaction_mandatory/__init__.py diff --git a/tests/flattener_dicos/60familyaction_mandatory/extra_dirs/extra/00-base.xml b/tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml similarity index 100% rename from tests/flattener_dicos/60familyaction_mandatory/extra_dirs/extra/00-base.xml rename to tests/dictionaries/60familyaction_mandatory/extra_dirs/extra/00-base.xml diff --git a/tests/flattener_dicos/60familyaction_mandatory/makedict/base.json b/tests/dictionaries/60familyaction_mandatory/makedict/base.json similarity index 100% rename from tests/flattener_dicos/60familyaction_mandatory/makedict/base.json rename to tests/dictionaries/60familyaction_mandatory/makedict/base.json diff --git a/tests/flattener_dicos/60familyaction_mandatory/tiramisu/__init__.py b/tests/dictionaries/60familyaction_mandatory/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/60familyaction_mandatory/tiramisu/__init__.py rename to tests/dictionaries/60familyaction_mandatory/tiramisu/__init__.py diff --git a/tests/flattener_dicos/60familyaction_mandatory/tiramisu/base.py b/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py similarity index 88% rename from tests/flattener_dicos/60familyaction_mandatory/tiramisu/base.py rename to tests/dictionaries/60familyaction_mandatory/tiramisu/base.py index ba2f6254..eba4dcf7 100644 --- a/tests/flattener_dicos/60familyaction_mandatory/tiramisu/base.py +++ b/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/70container_files/00-base.xml b/tests/dictionaries/70container_files/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_files/00-base.xml rename to tests/dictionaries/70container_files/00-base.xml diff --git a/tests/flattener_dicos/70container_files/__init__.py b/tests/dictionaries/70container_files/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_files/__init__.py rename to tests/dictionaries/70container_files/__init__.py diff --git a/tests/flattener_dicos/70container_files/makedict/base.json b/tests/dictionaries/70container_files/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_files/makedict/base.json rename to tests/dictionaries/70container_files/makedict/base.json diff --git a/tests/templates/70container_files/result/etc/mailname b/tests/dictionaries/70container_files/result/etc/mailname similarity index 100% rename from tests/templates/70container_files/result/etc/mailname rename to tests/dictionaries/70container_files/result/etc/mailname diff --git a/tests/templates/70container_files/result/rougail.conf b/tests/dictionaries/70container_files/result/rougail.conf similarity index 100% rename from tests/templates/70container_files/result/rougail.conf rename to tests/dictionaries/70container_files/result/rougail.conf diff --git a/tests/flattener_dicos/70container_files/tiramisu/__init__.py b/tests/dictionaries/70container_files/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_files/tiramisu/__init__.py rename to tests/dictionaries/70container_files/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_files/tiramisu/base.py b/tests/dictionaries/70container_files/tiramisu/base.py similarity index 94% rename from tests/flattener_dicos/70container_files/tiramisu/base.py rename to tests/dictionaries/70container_files/tiramisu/base.py index fd979f08..5885ac5e 100644 --- a/tests/flattener_dicos/70container_files/tiramisu/base.py +++ b/tests/dictionaries/70container_files/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/templates/70container_files/tmpl/mailname b/tests/dictionaries/70container_files/tmpl/mailname similarity index 100% rename from tests/templates/70container_files/tmpl/mailname rename to tests/dictionaries/70container_files/tmpl/mailname diff --git a/tests/templates/70container_files/tmpl/rougail.conf b/tests/dictionaries/70container_files/tmpl/rougail.conf similarity index 100% rename from tests/templates/70container_files/tmpl/rougail.conf rename to tests/dictionaries/70container_files/tmpl/rougail.conf diff --git a/tests/flattener_dicos/70container_files_symlink_multi/00-base.xml b/tests/dictionaries/70container_files_symlink_multi/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_files_symlink_multi/00-base.xml rename to tests/dictionaries/70container_files_symlink_multi/00-base.xml diff --git a/tests/flattener_dicos/70container_files_symlink_multi/__init__.py b/tests/dictionaries/70container_files_symlink_multi/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_files_symlink_multi/__init__.py rename to tests/dictionaries/70container_files_symlink_multi/__init__.py diff --git a/tests/flattener_dicos/70container_files_symlink_multi/makedict/base.json b/tests/dictionaries/70container_files_symlink_multi/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_files_symlink_multi/makedict/base.json rename to tests/dictionaries/70container_files_symlink_multi/makedict/base.json diff --git a/tests/templates/70container_files_symlink_multi/result/etc/mailname b/tests/dictionaries/70container_files_symlink_multi/result/etc/mailname similarity index 100% rename from tests/templates/70container_files_symlink_multi/result/etc/mailname rename to tests/dictionaries/70container_files_symlink_multi/result/etc/mailname diff --git a/tests/templates/70container_files_symlink_multi/result/etc/mailname2 b/tests/dictionaries/70container_files_symlink_multi/result/etc/mailname2 similarity index 100% rename from tests/templates/70container_files_symlink_multi/result/etc/mailname2 rename to tests/dictionaries/70container_files_symlink_multi/result/etc/mailname2 diff --git a/tests/flattener_dicos/70container_files_symlink_multi/tiramisu/__init__.py b/tests/dictionaries/70container_files_symlink_multi/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_files_symlink_multi/tiramisu/__init__.py rename to tests/dictionaries/70container_files_symlink_multi/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_files_symlink_multi/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/70container_files_symlink_multi/tiramisu/base.py rename to tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py index a691664d..645333a6 100644 --- a/tests/flattener_dicos/70container_files_symlink_multi/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='file_name', doc='file_name', multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi='/etc/mailname2') option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/templates/70container_files_symlink_multi/tmpl/mailname b/tests/dictionaries/70container_files_symlink_multi/tmpl/mailname similarity index 100% rename from tests/templates/70container_files_symlink_multi/tmpl/mailname rename to tests/dictionaries/70container_files_symlink_multi/tmpl/mailname diff --git a/tests/flattener_dicos/70container_files_symlink_multi_variable/00-base.xml b/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_files_symlink_multi_variable/00-base.xml rename to tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml diff --git a/tests/flattener_dicos/70container_files_symlink_multi_variable/__init__.py b/tests/dictionaries/70container_files_symlink_multi_variable/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_files_symlink_multi_variable/__init__.py rename to tests/dictionaries/70container_files_symlink_multi_variable/__init__.py diff --git a/tests/flattener_dicos/70container_files_symlink_multi_variable/makedict/base.json b/tests/dictionaries/70container_files_symlink_multi_variable/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_files_symlink_multi_variable/makedict/base.json rename to tests/dictionaries/70container_files_symlink_multi_variable/makedict/base.json diff --git a/tests/templates/70container_files_symlink_multi_variable/result/etc/mailname b/tests/dictionaries/70container_files_symlink_multi_variable/result/etc/mailname similarity index 100% rename from tests/templates/70container_files_symlink_multi_variable/result/etc/mailname rename to tests/dictionaries/70container_files_symlink_multi_variable/result/etc/mailname diff --git a/tests/templates/70container_files_symlink_multi_variable/result/etc/mailname2 b/tests/dictionaries/70container_files_symlink_multi_variable/result/etc/mailname2 similarity index 100% rename from tests/templates/70container_files_symlink_multi_variable/result/etc/mailname2 rename to tests/dictionaries/70container_files_symlink_multi_variable/result/etc/mailname2 diff --git a/tests/flattener_dicos/70container_files_symlink_multi_variable/tiramisu/__init__.py b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_files_symlink_multi_variable/tiramisu/__init__.py rename to tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_files_symlink_multi_variable/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py similarity index 93% rename from tests/flattener_dicos/70container_files_symlink_multi_variable/tiramisu/base.py rename to tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py index 5e76710f..3568afc4 100644 --- a/tests/flattener_dicos/70container_files_symlink_multi_variable/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='file_name', doc='file_name', multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi='/etc/mailname2') option_5 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='var', doc='var', multi=True, default=['mailname', 'mailname2'], default_multi='mailname2') diff --git a/tests/templates/70container_files_symlink_multi_variable/tmpl/mailname b/tests/dictionaries/70container_files_symlink_multi_variable/tmpl/mailname similarity index 100% rename from tests/templates/70container_files_symlink_multi_variable/tmpl/mailname rename to tests/dictionaries/70container_files_symlink_multi_variable/tmpl/mailname diff --git a/tests/flattener_dicos/70container_files_twice/00-base.xml b/tests/dictionaries/70container_files_twice/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_files_twice/00-base.xml rename to tests/dictionaries/70container_files_twice/00-base.xml diff --git a/tests/flattener_dicos/70container_files_twice/__init__.py b/tests/dictionaries/70container_files_twice/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_files_twice/__init__.py rename to tests/dictionaries/70container_files_twice/__init__.py diff --git a/tests/flattener_dicos/70container_files_twice/makedict/base.json b/tests/dictionaries/70container_files_twice/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_files_twice/makedict/base.json rename to tests/dictionaries/70container_files_twice/makedict/base.json diff --git a/tests/flattener_dicos/70container_files_twice/tiramisu/__init__.py b/tests/dictionaries/70container_files_twice/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_files_twice/tiramisu/__init__.py rename to tests/dictionaries/70container_files_twice/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_files_twice/tiramisu/base.py b/tests/dictionaries/70container_files_twice/tiramisu/base.py similarity index 95% rename from tests/flattener_dicos/70container_files_twice/tiramisu/base.py rename to tests/dictionaries/70container_files_twice/tiramisu/base.py index ad85eac1..0a2abddb 100644 --- a/tests/flattener_dicos/70container_files_twice/tiramisu/base.py +++ b/tests/dictionaries/70container_files_twice/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/70container_filesmulti/00-base.xml b/tests/dictionaries/70container_filesmulti/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_filesmulti/00-base.xml rename to tests/dictionaries/70container_filesmulti/00-base.xml diff --git a/tests/flattener_dicos/70container_filesmulti/__init__.py b/tests/dictionaries/70container_filesmulti/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_filesmulti/__init__.py rename to tests/dictionaries/70container_filesmulti/__init__.py diff --git a/tests/flattener_dicos/70container_filesmulti/makedict/base.json b/tests/dictionaries/70container_filesmulti/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_filesmulti/makedict/base.json rename to tests/dictionaries/70container_filesmulti/makedict/base.json diff --git a/tests/flattener_dicos/70container_filesmulti/tiramisu/__init__.py b/tests/dictionaries/70container_filesmulti/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_filesmulti/tiramisu/__init__.py rename to tests/dictionaries/70container_filesmulti/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_filesmulti/tiramisu/base.py b/tests/dictionaries/70container_filesmulti/tiramisu/base.py similarity index 94% rename from tests/flattener_dicos/70container_filesmulti/tiramisu/base.py rename to tests/dictionaries/70container_filesmulti/tiramisu/base.py index 20734465..ab9a703c 100644 --- a/tests/flattener_dicos/70container_filesmulti/tiramisu/base.py +++ b/tests/dictionaries/70container_filesmulti/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/70container_filesredefine/00-base.xml b/tests/dictionaries/70container_filesredefine/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_filesredefine/00-base.xml rename to tests/dictionaries/70container_filesredefine/00-base.xml diff --git a/tests/flattener_dicos/70container_filesredefine/01-base.xml b/tests/dictionaries/70container_filesredefine/01-base.xml similarity index 100% rename from tests/flattener_dicos/70container_filesredefine/01-base.xml rename to tests/dictionaries/70container_filesredefine/01-base.xml diff --git a/tests/flattener_dicos/70container_filesredefine/__init__.py b/tests/dictionaries/70container_filesredefine/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_filesredefine/__init__.py rename to tests/dictionaries/70container_filesredefine/__init__.py diff --git a/tests/flattener_dicos/70container_filesredefine/makedict/base.json b/tests/dictionaries/70container_filesredefine/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_filesredefine/makedict/base.json rename to tests/dictionaries/70container_filesredefine/makedict/base.json diff --git a/tests/flattener_dicos/70container_filesredefine/tiramisu/__init__.py b/tests/dictionaries/70container_filesredefine/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_filesredefine/tiramisu/__init__.py rename to tests/dictionaries/70container_filesredefine/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_filesredefine/tiramisu/base.py b/tests/dictionaries/70container_filesredefine/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/70container_filesredefine/tiramisu/base.py rename to tests/dictionaries/70container_filesredefine/tiramisu/base.py index 535ab37f..140c83d3 100644 --- a/tests/flattener_dicos/70container_filesredefine/tiramisu/base.py +++ b/tests/dictionaries/70container_filesredefine/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/70container_new/00-base.xml b/tests/dictionaries/70container_new/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_new/00-base.xml rename to tests/dictionaries/70container_new/00-base.xml diff --git a/tests/flattener_dicos/70container_new/__init__.py b/tests/dictionaries/70container_new/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_new/__init__.py rename to tests/dictionaries/70container_new/__init__.py diff --git a/tests/flattener_dicos/70container_new/makedict/base.json b/tests/dictionaries/70container_new/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_new/makedict/base.json rename to tests/dictionaries/70container_new/makedict/base.json diff --git a/tests/flattener_dicos/70container_new/tiramisu/__init__.py b/tests/dictionaries/70container_new/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_new/tiramisu/__init__.py rename to tests/dictionaries/70container_new/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_new/tiramisu/base.py b/tests/dictionaries/70container_new/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/70container_new/tiramisu/base.py rename to tests/dictionaries/70container_new/tiramisu/base.py index 32d64fd3..2ab86b31 100644 --- a/tests/flattener_dicos/70container_new/tiramisu/base.py +++ b/tests/dictionaries/70container_new/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/70container_newnocont/00-base.xml b/tests/dictionaries/70container_newnocont/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_newnocont/00-base.xml rename to tests/dictionaries/70container_newnocont/00-base.xml diff --git a/tests/flattener_dicos/70container_newnocont/__init__.py b/tests/dictionaries/70container_newnocont/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_newnocont/__init__.py rename to tests/dictionaries/70container_newnocont/__init__.py diff --git a/tests/flattener_dicos/70container_newnocont/makedict/base.json b/tests/dictionaries/70container_newnocont/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_newnocont/makedict/base.json rename to tests/dictionaries/70container_newnocont/makedict/base.json diff --git a/tests/flattener_dicos/70container_newnocont/tiramisu/__init__.py b/tests/dictionaries/70container_newnocont/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_newnocont/tiramisu/__init__.py rename to tests/dictionaries/70container_newnocont/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_newnocont/tiramisu/base.py b/tests/dictionaries/70container_newnocont/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/70container_newnocont/tiramisu/base.py rename to tests/dictionaries/70container_newnocont/tiramisu/base.py index fed3f064..976dbe69 100644 --- a/tests/flattener_dicos/70container_newnocont/tiramisu/base.py +++ b/tests/dictionaries/70container_newnocont/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/70container_newwithip/00-base.xml b/tests/dictionaries/70container_newwithip/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_newwithip/00-base.xml rename to tests/dictionaries/70container_newwithip/00-base.xml diff --git a/tests/flattener_dicos/70container_newwithip/__init__.py b/tests/dictionaries/70container_newwithip/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_newwithip/__init__.py rename to tests/dictionaries/70container_newwithip/__init__.py diff --git a/tests/flattener_dicos/70container_newwithip/makedict/base.json b/tests/dictionaries/70container_newwithip/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_newwithip/makedict/base.json rename to tests/dictionaries/70container_newwithip/makedict/base.json diff --git a/tests/flattener_dicos/70container_newwithip/tiramisu/__init__.py b/tests/dictionaries/70container_newwithip/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_newwithip/tiramisu/__init__.py rename to tests/dictionaries/70container_newwithip/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_newwithip/tiramisu/base.py b/tests/dictionaries/70container_newwithip/tiramisu/base.py similarity index 87% rename from tests/flattener_dicos/70container_newwithip/tiramisu/base.py rename to tests/dictionaries/70container_newwithip/tiramisu/base.py index 8fc41114..225e702a 100644 --- a/tests/flattener_dicos/70container_newwithip/tiramisu/base.py +++ b/tests/dictionaries/70container_newwithip/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_4 = IPOption(allow_reserved=True, properties=frozenset({'normal'}), name='adresse_ip_test', doc='No change', multi=False) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) diff --git a/tests/flattener_dicos/70container_pathaccess/00-base.xml b/tests/dictionaries/70container_pathaccess/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_pathaccess/00-base.xml rename to tests/dictionaries/70container_pathaccess/00-base.xml diff --git a/tests/flattener_dicos/70container_pathaccess/__init__.py b/tests/dictionaries/70container_pathaccess/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_pathaccess/__init__.py rename to tests/dictionaries/70container_pathaccess/__init__.py diff --git a/tests/flattener_dicos/70container_pathaccess/makedict/base.json b/tests/dictionaries/70container_pathaccess/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_pathaccess/makedict/base.json rename to tests/dictionaries/70container_pathaccess/makedict/base.json diff --git a/tests/flattener_dicos/70container_pathaccess/tiramisu/__init__.py b/tests/dictionaries/70container_pathaccess/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_pathaccess/tiramisu/__init__.py rename to tests/dictionaries/70container_pathaccess/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_pathaccess/tiramisu/base.py b/tests/dictionaries/70container_pathaccess/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/70container_pathaccess/tiramisu/base.py rename to tests/dictionaries/70container_pathaccess/tiramisu/base.py index 7e0d5c67..6bce2145 100644 --- a/tests/flattener_dicos/70container_pathaccess/tiramisu/base.py +++ b/tests/dictionaries/70container_pathaccess/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_4 = NetmaskOption(properties=frozenset({'basic', 'mandatory'}), name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', multi=False) option_5 = NetworkOption(properties=frozenset({'basic', 'mandatory'}), name='nut_monitor_host', doc='Adresse IP du réseau de l\'esclave', multi=False) diff --git a/tests/flattener_dicos/70container_pathaccess_leadership/00-base.xml b/tests/dictionaries/70container_pathaccess_leadership/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_pathaccess_leadership/00-base.xml rename to tests/dictionaries/70container_pathaccess_leadership/00-base.xml diff --git a/tests/flattener_dicos/70container_pathaccess_leadership/__init__.py b/tests/dictionaries/70container_pathaccess_leadership/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_pathaccess_leadership/__init__.py rename to tests/dictionaries/70container_pathaccess_leadership/__init__.py diff --git a/tests/flattener_dicos/70container_pathaccess_leadership/makedict/base.json b/tests/dictionaries/70container_pathaccess_leadership/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_pathaccess_leadership/makedict/base.json rename to tests/dictionaries/70container_pathaccess_leadership/makedict/base.json diff --git a/tests/flattener_dicos/70container_pathaccess_leadership/tiramisu/__init__.py b/tests/dictionaries/70container_pathaccess_leadership/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_pathaccess_leadership/tiramisu/__init__.py rename to tests/dictionaries/70container_pathaccess_leadership/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_pathaccess_leadership/tiramisu/base.py b/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py similarity index 92% rename from tests/flattener_dicos/70container_pathaccess_leadership/tiramisu/base.py rename to tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py index e6b3e795..05bdc205 100644 --- a/tests/flattener_dicos/70container_pathaccess_leadership/tiramisu/base.py +++ b/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_5 = NetmaskOption(properties=frozenset({'mandatory'}), name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', multi=True) option_6 = NetworkOption(properties=frozenset({'basic', 'mandatory'}), name='nut_monitor_host', doc='Adresse IP du réseau de l\'esclave', multi=True) diff --git a/tests/flattener_dicos/70container_save/00-base.xml b/tests/dictionaries/70container_save/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_save/00-base.xml rename to tests/dictionaries/70container_save/00-base.xml diff --git a/tests/flattener_dicos/70container_save/__init__.py b/tests/dictionaries/70container_save/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_save/__init__.py rename to tests/dictionaries/70container_save/__init__.py diff --git a/tests/flattener_dicos/70container_save/makedict/base.json b/tests/dictionaries/70container_save/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_save/makedict/base.json rename to tests/dictionaries/70container_save/makedict/base.json diff --git a/tests/flattener_dicos/70container_save/tiramisu/__init__.py b/tests/dictionaries/70container_save/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_save/tiramisu/__init__.py rename to tests/dictionaries/70container_save/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_save/tiramisu/base.py b/tests/dictionaries/70container_save/tiramisu/base.py similarity index 80% rename from tests/flattener_dicos/70container_save/tiramisu/base.py rename to tests/dictionaries/70container_save/tiramisu/base.py index f3992cfa..35b321c8 100644 --- a/tests/flattener_dicos/70container_save/tiramisu/base.py +++ b/tests/dictionaries/70container_save/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/70container_serviceaccess/00-base.xml b/tests/dictionaries/70container_serviceaccess/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_serviceaccess/00-base.xml rename to tests/dictionaries/70container_serviceaccess/00-base.xml diff --git a/tests/flattener_dicos/70container_serviceaccess/__init__.py b/tests/dictionaries/70container_serviceaccess/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_serviceaccess/__init__.py rename to tests/dictionaries/70container_serviceaccess/__init__.py diff --git a/tests/flattener_dicos/70container_serviceaccess/makedict/base.json b/tests/dictionaries/70container_serviceaccess/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_serviceaccess/makedict/base.json rename to tests/dictionaries/70container_serviceaccess/makedict/base.json diff --git a/tests/flattener_dicos/70container_serviceaccess/tiramisu/__init__.py b/tests/dictionaries/70container_serviceaccess/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_serviceaccess/tiramisu/__init__.py rename to tests/dictionaries/70container_serviceaccess/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_serviceaccess/tiramisu/base.py b/tests/dictionaries/70container_serviceaccess/tiramisu/base.py similarity index 89% rename from tests/flattener_dicos/70container_serviceaccess/tiramisu/base.py rename to tests/dictionaries/70container_serviceaccess/tiramisu/base.py index 5482792a..f0305311 100644 --- a/tests/flattener_dicos/70container_serviceaccess/tiramisu/base.py +++ b/tests/dictionaries/70container_serviceaccess/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/70container_servicerestriction/00-base.xml b/tests/dictionaries/70container_servicerestriction/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_servicerestriction/00-base.xml rename to tests/dictionaries/70container_servicerestriction/00-base.xml diff --git a/tests/flattener_dicos/70container_servicerestriction/__init__.py b/tests/dictionaries/70container_servicerestriction/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_servicerestriction/__init__.py rename to tests/dictionaries/70container_servicerestriction/__init__.py diff --git a/tests/flattener_dicos/70container_servicerestriction/makedict/base.json b/tests/dictionaries/70container_servicerestriction/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_servicerestriction/makedict/base.json rename to tests/dictionaries/70container_servicerestriction/makedict/base.json diff --git a/tests/flattener_dicos/70container_servicerestriction/tiramisu/__init__.py b/tests/dictionaries/70container_servicerestriction/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_servicerestriction/tiramisu/__init__.py rename to tests/dictionaries/70container_servicerestriction/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_servicerestriction/tiramisu/base.py b/tests/dictionaries/70container_servicerestriction/tiramisu/base.py similarity index 90% rename from tests/flattener_dicos/70container_servicerestriction/tiramisu/base.py rename to tests/dictionaries/70container_servicerestriction/tiramisu/base.py index 954c5aac..2d3a793b 100644 --- a/tests/flattener_dicos/70container_servicerestriction/tiramisu/base.py +++ b/tests/dictionaries/70container_servicerestriction/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/70container_services/00-base.xml b/tests/dictionaries/70container_services/00-base.xml similarity index 100% rename from tests/flattener_dicos/70container_services/00-base.xml rename to tests/dictionaries/70container_services/00-base.xml diff --git a/tests/flattener_dicos/70container_services/__init__.py b/tests/dictionaries/70container_services/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_services/__init__.py rename to tests/dictionaries/70container_services/__init__.py diff --git a/tests/flattener_dicos/70container_services/makedict/base.json b/tests/dictionaries/70container_services/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70container_services/makedict/base.json rename to tests/dictionaries/70container_services/makedict/base.json diff --git a/tests/flattener_dicos/70container_services/tiramisu/__init__.py b/tests/dictionaries/70container_services/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70container_services/tiramisu/__init__.py rename to tests/dictionaries/70container_services/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70container_services/tiramisu/base.py b/tests/dictionaries/70container_services/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/70container_services/tiramisu/base.py rename to tests/dictionaries/70container_services/tiramisu/base.py index b43dfac4..ab392227 100644 --- a/tests/flattener_dicos/70container_services/tiramisu/base.py +++ b/tests/dictionaries/70container_services/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/70services_unmanage/00-base.xml b/tests/dictionaries/70services_unmanage/00-base.xml similarity index 100% rename from tests/flattener_dicos/70services_unmanage/00-base.xml rename to tests/dictionaries/70services_unmanage/00-base.xml diff --git a/tests/flattener_dicos/70services_unmanage/__init__.py b/tests/dictionaries/70services_unmanage/__init__.py similarity index 100% rename from tests/flattener_dicos/70services_unmanage/__init__.py rename to tests/dictionaries/70services_unmanage/__init__.py diff --git a/tests/flattener_dicos/70services_unmanage/makedict/base.json b/tests/dictionaries/70services_unmanage/makedict/base.json similarity index 100% rename from tests/flattener_dicos/70services_unmanage/makedict/base.json rename to tests/dictionaries/70services_unmanage/makedict/base.json diff --git a/tests/flattener_dicos/70services_unmanage/tiramisu/__init__.py b/tests/dictionaries/70services_unmanage/tiramisu/__init__.py similarity index 100% rename from tests/flattener_dicos/70services_unmanage/tiramisu/__init__.py rename to tests/dictionaries/70services_unmanage/tiramisu/__init__.py diff --git a/tests/flattener_dicos/70services_unmanage/tiramisu/base.py b/tests/dictionaries/70services_unmanage/tiramisu/base.py similarity index 85% rename from tests/flattener_dicos/70services_unmanage/tiramisu/base.py rename to tests/dictionaries/70services_unmanage/tiramisu/base.py index dbb49546..ae77a044 100644 --- a/tests/flattener_dicos/70services_unmanage/tiramisu/base.py +++ b/tests/dictionaries/70services_unmanage/tiramisu/base.py @@ -1,7 +1,10 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/flattener_dicos/80condition_itself/00-base.xml b/tests/dictionaries/80condition_itself/00-base.xml similarity index 100% rename from tests/flattener_dicos/80condition_itself/00-base.xml rename to tests/dictionaries/80condition_itself/00-base.xml diff --git a/tests/flattener_dicos/80condition_itself/__init__.py b/tests/dictionaries/80condition_itself/__init__.py similarity index 100% rename from tests/flattener_dicos/80condition_itself/__init__.py rename to tests/dictionaries/80condition_itself/__init__.py diff --git a/tests/flattener_dicos/80condition_not_exists_error/00-base.xml b/tests/dictionaries/80condition_not_exists_error/00-base.xml similarity index 100% rename from tests/flattener_dicos/80condition_not_exists_error/00-base.xml rename to tests/dictionaries/80condition_not_exists_error/00-base.xml diff --git a/tests/flattener_dicos/80condition_not_exists_error/__init__.py b/tests/dictionaries/80condition_not_exists_error/__init__.py similarity index 100% rename from tests/flattener_dicos/80condition_not_exists_error/__init__.py rename to tests/dictionaries/80condition_not_exists_error/__init__.py diff --git a/tests/flattener_dicos/80container_files_symlink_without_source/00-base.xml b/tests/dictionaries/80container_files_symlink_without_source/00-base.xml similarity index 100% rename from tests/flattener_dicos/80container_files_symlink_without_source/00-base.xml rename to tests/dictionaries/80container_files_symlink_without_source/00-base.xml diff --git a/tests/flattener_dicos/80container_files_symlink_without_source/__init__.py b/tests/dictionaries/80container_files_symlink_without_source/__init__.py similarity index 100% rename from tests/flattener_dicos/80container_files_symlink_without_source/__init__.py rename to tests/dictionaries/80container_files_symlink_without_source/__init__.py diff --git a/tests/flattener_dicos/80container_filesredefine_error/00-base.xml b/tests/dictionaries/80container_filesredefine_error/00-base.xml similarity index 100% rename from tests/flattener_dicos/80container_filesredefine_error/00-base.xml rename to tests/dictionaries/80container_filesredefine_error/00-base.xml diff --git a/tests/flattener_dicos/80container_filesredefine_error/01-base.xml b/tests/dictionaries/80container_filesredefine_error/01-base.xml similarity index 100% rename from tests/flattener_dicos/80container_filesredefine_error/01-base.xml rename to tests/dictionaries/80container_filesredefine_error/01-base.xml diff --git a/tests/flattener_dicos/80container_filesredefine_error/__init__.py b/tests/dictionaries/80container_filesredefine_error/__init__.py similarity index 100% rename from tests/flattener_dicos/80container_filesredefine_error/__init__.py rename to tests/dictionaries/80container_filesredefine_error/__init__.py diff --git a/tests/flattener_dicos/80empty_typeeole_eole/00_base.xml b/tests/dictionaries/80empty_typeeole_eole/00_base.xml similarity index 100% rename from tests/flattener_dicos/80empty_typeeole_eole/00_base.xml rename to tests/dictionaries/80empty_typeeole_eole/00_base.xml diff --git a/tests/flattener_dicos/80empty_typeeole_eole/__init__.py b/tests/dictionaries/80empty_typeeole_eole/__init__.py similarity index 100% rename from tests/flattener_dicos/80empty_typeeole_eole/__init__.py rename to tests/dictionaries/80empty_typeeole_eole/__init__.py diff --git a/tests/flattener_dicos/80empty_typeeole_number/00_base.xml b/tests/dictionaries/80empty_typeeole_number/00_base.xml similarity index 100% rename from tests/flattener_dicos/80empty_typeeole_number/00_base.xml rename to tests/dictionaries/80empty_typeeole_number/00_base.xml diff --git a/tests/flattener_dicos/80empty_typeeole_number/__init__.py b/tests/dictionaries/80empty_typeeole_number/__init__.py similarity index 100% rename from tests/flattener_dicos/80empty_typeeole_number/__init__.py rename to tests/dictionaries/80empty_typeeole_number/__init__.py diff --git a/tests/flattener_dicos/80empty_typeeole_python/00_base.xml b/tests/dictionaries/80empty_typeeole_python/00_base.xml similarity index 100% rename from tests/flattener_dicos/80empty_typeeole_python/00_base.xml rename to tests/dictionaries/80empty_typeeole_python/00_base.xml diff --git a/tests/flattener_dicos/80empty_typeeole_python/__init__.py b/tests/dictionaries/80empty_typeeole_python/__init__.py similarity index 100% rename from tests/flattener_dicos/80empty_typeeole_python/__init__.py rename to tests/dictionaries/80empty_typeeole_python/__init__.py diff --git a/tests/flattener_dicos/80empty_validenum/00-base.xml b/tests/dictionaries/80empty_validenum/00-base.xml similarity index 100% rename from tests/flattener_dicos/80empty_validenum/00-base.xml rename to tests/dictionaries/80empty_validenum/00-base.xml diff --git a/tests/flattener_dicos/80empty_validenum/__init__.py b/tests/dictionaries/80empty_validenum/__init__.py similarity index 100% rename from tests/flattener_dicos/80empty_validenum/__init__.py rename to tests/dictionaries/80empty_validenum/__init__.py diff --git a/tests/flattener_dicos/80family_several/00-base.xml b/tests/dictionaries/80family_several/00-base.xml similarity index 100% rename from tests/flattener_dicos/80family_several/00-base.xml rename to tests/dictionaries/80family_several/00-base.xml diff --git a/tests/flattener_dicos/80family_several/__init__.py b/tests/dictionaries/80family_several/__init__.py similarity index 100% rename from tests/flattener_dicos/80family_several/__init__.py rename to tests/dictionaries/80family_several/__init__.py diff --git a/tests/flattener_dicos/80fill_autofreeze/00-base.xml b/tests/dictionaries/80fill_autofreeze/00-base.xml similarity index 100% rename from tests/flattener_dicos/80fill_autofreeze/00-base.xml rename to tests/dictionaries/80fill_autofreeze/00-base.xml diff --git a/tests/flattener_dicos/80fill_autofreeze/__init__.py b/tests/dictionaries/80fill_autofreeze/__init__.py similarity index 100% rename from tests/flattener_dicos/80fill_autofreeze/__init__.py rename to tests/dictionaries/80fill_autofreeze/__init__.py diff --git a/tests/flattener_dicos/80fill_error/00-base.xml b/tests/dictionaries/80fill_error/00-base.xml similarity index 100% rename from tests/flattener_dicos/80fill_error/00-base.xml rename to tests/dictionaries/80fill_error/00-base.xml diff --git a/tests/flattener_dicos/80fill_error/__init__.py b/tests/dictionaries/80fill_error/__init__.py similarity index 100% rename from tests/flattener_dicos/80fill_error/__init__.py rename to tests/dictionaries/80fill_error/__init__.py diff --git a/tests/flattener_dicos/80fill_multi/00-base.xml b/tests/dictionaries/80fill_multi/00-base.xml similarity index 100% rename from tests/flattener_dicos/80fill_multi/00-base.xml rename to tests/dictionaries/80fill_multi/00-base.xml diff --git a/tests/flattener_dicos/80fill_multi/__init__.py b/tests/dictionaries/80fill_multi/__init__.py similarity index 100% rename from tests/flattener_dicos/80fill_multi/__init__.py rename to tests/dictionaries/80fill_multi/__init__.py diff --git a/tests/flattener_dicos/80hidden_if_in_filelist/00-base.xml b/tests/dictionaries/80hidden_if_in_filelist/00-base.xml similarity index 100% rename from tests/flattener_dicos/80hidden_if_in_filelist/00-base.xml rename to tests/dictionaries/80hidden_if_in_filelist/00-base.xml diff --git a/tests/flattener_dicos/80hidden_if_in_filelist/__init__.py b/tests/dictionaries/80hidden_if_in_filelist/__init__.py similarity index 100% rename from tests/flattener_dicos/80hidden_if_in_filelist/__init__.py rename to tests/dictionaries/80hidden_if_in_filelist/__init__.py diff --git a/tests/flattener_dicos/80leadership_auto_save/00-base.xml b/tests/dictionaries/80leadership_auto_save/00-base.xml similarity index 100% rename from tests/flattener_dicos/80leadership_auto_save/00-base.xml rename to tests/dictionaries/80leadership_auto_save/00-base.xml diff --git a/tests/flattener_dicos/80leadership_auto_save/__init__.py b/tests/dictionaries/80leadership_auto_save/__init__.py similarity index 100% rename from tests/flattener_dicos/80leadership_auto_save/__init__.py rename to tests/dictionaries/80leadership_auto_save/__init__.py diff --git a/tests/flattener_dicos/80leadership_autofreeze/00-base.xml b/tests/dictionaries/80leadership_autofreeze/00-base.xml similarity index 100% rename from tests/flattener_dicos/80leadership_autofreeze/00-base.xml rename to tests/dictionaries/80leadership_autofreeze/00-base.xml diff --git a/tests/flattener_dicos/80leadership_autofreeze/__init__.py b/tests/dictionaries/80leadership_autofreeze/__init__.py similarity index 100% rename from tests/flattener_dicos/80leadership_autofreeze/__init__.py rename to tests/dictionaries/80leadership_autofreeze/__init__.py diff --git a/tests/flattener_dicos/80leadership_none_follower_between_follower/00-base.xml b/tests/dictionaries/80leadership_none_follower_between_follower/00-base.xml similarity index 100% rename from tests/flattener_dicos/80leadership_none_follower_between_follower/00-base.xml rename to tests/dictionaries/80leadership_none_follower_between_follower/00-base.xml diff --git a/tests/flattener_dicos/80leadership_none_follower_between_follower/__init__.py b/tests/dictionaries/80leadership_none_follower_between_follower/__init__.py similarity index 100% rename from tests/flattener_dicos/80leadership_none_follower_between_follower/__init__.py rename to tests/dictionaries/80leadership_none_follower_between_follower/__init__.py diff --git a/tests/flattener_dicos/80leadership_not_ordered/00-base.xml b/tests/dictionaries/80leadership_not_ordered/00-base.xml similarity index 100% rename from tests/flattener_dicos/80leadership_not_ordered/00-base.xml rename to tests/dictionaries/80leadership_not_ordered/00-base.xml diff --git a/tests/flattener_dicos/80leadership_not_ordered/__init__.py b/tests/dictionaries/80leadership_not_ordered/__init__.py similarity index 100% rename from tests/flattener_dicos/80leadership_not_ordered/__init__.py rename to tests/dictionaries/80leadership_not_ordered/__init__.py diff --git a/tests/flattener_dicos/80leadership_not_same_family/00-base.xml b/tests/dictionaries/80leadership_not_same_family/00-base.xml similarity index 100% rename from tests/flattener_dicos/80leadership_not_same_family/00-base.xml rename to tests/dictionaries/80leadership_not_same_family/00-base.xml diff --git a/tests/flattener_dicos/80leadership_not_same_family/__init__.py b/tests/dictionaries/80leadership_not_same_family/__init__.py similarity index 100% rename from tests/flattener_dicos/80leadership_not_same_family/__init__.py rename to tests/dictionaries/80leadership_not_same_family/__init__.py diff --git a/tests/flattener_dicos/80leadership_notexists/00-base.xml b/tests/dictionaries/80leadership_notexists/00-base.xml similarity index 100% rename from tests/flattener_dicos/80leadership_notexists/00-base.xml rename to tests/dictionaries/80leadership_notexists/00-base.xml diff --git a/tests/flattener_dicos/80leadership_notexists/__init__.py b/tests/dictionaries/80leadership_notexists/__init__.py similarity index 100% rename from tests/flattener_dicos/80leadership_notexists/__init__.py rename to tests/dictionaries/80leadership_notexists/__init__.py diff --git a/tests/flattener_dicos/80redefine_error/00-base.xml b/tests/dictionaries/80redefine_error/00-base.xml similarity index 100% rename from tests/flattener_dicos/80redefine_error/00-base.xml rename to tests/dictionaries/80redefine_error/00-base.xml diff --git a/tests/flattener_dicos/80redefine_error/01-redefine.xml b/tests/dictionaries/80redefine_error/01-redefine.xml similarity index 100% rename from tests/flattener_dicos/80redefine_error/01-redefine.xml rename to tests/dictionaries/80redefine_error/01-redefine.xml diff --git a/tests/flattener_dicos/80redefine_error/__init__.py b/tests/dictionaries/80redefine_error/__init__.py similarity index 100% rename from tests/flattener_dicos/80redefine_error/__init__.py rename to tests/dictionaries/80redefine_error/__init__.py diff --git a/tests/flattener_dicos/80redefine_fillerror/00-base.xml b/tests/dictionaries/80redefine_fillerror/00-base.xml similarity index 100% rename from tests/flattener_dicos/80redefine_fillerror/00-base.xml rename to tests/dictionaries/80redefine_fillerror/00-base.xml diff --git a/tests/flattener_dicos/80redefine_fillerror/01-base.xml b/tests/dictionaries/80redefine_fillerror/01-base.xml similarity index 100% rename from tests/flattener_dicos/80redefine_fillerror/01-base.xml rename to tests/dictionaries/80redefine_fillerror/01-base.xml diff --git a/tests/flattener_dicos/80redefine_fillerror/__init__.py b/tests/dictionaries/80redefine_fillerror/__init__.py similarity index 100% rename from tests/flattener_dicos/80redefine_fillerror/__init__.py rename to tests/dictionaries/80redefine_fillerror/__init__.py diff --git a/tests/flattener_dicos/80redefine_helperror/00-base.xml b/tests/dictionaries/80redefine_helperror/00-base.xml similarity index 100% rename from tests/flattener_dicos/80redefine_helperror/00-base.xml rename to tests/dictionaries/80redefine_helperror/00-base.xml diff --git a/tests/flattener_dicos/80redefine_helperror/01-base.xml b/tests/dictionaries/80redefine_helperror/01-base.xml similarity index 100% rename from tests/flattener_dicos/80redefine_helperror/01-base.xml rename to tests/dictionaries/80redefine_helperror/01-base.xml diff --git a/tests/flattener_dicos/80redefine_helperror/__init__.py b/tests/dictionaries/80redefine_helperror/__init__.py similarity index 100% rename from tests/flattener_dicos/80redefine_helperror/__init__.py rename to tests/dictionaries/80redefine_helperror/__init__.py diff --git a/tests/flattener_dicos/80redefine_notexists/00-base.xml b/tests/dictionaries/80redefine_notexists/00-base.xml similarity index 100% rename from tests/flattener_dicos/80redefine_notexists/00-base.xml rename to tests/dictionaries/80redefine_notexists/00-base.xml diff --git a/tests/flattener_dicos/80redefine_notexists/01-redefine.xml b/tests/dictionaries/80redefine_notexists/01-redefine.xml similarity index 100% rename from tests/flattener_dicos/80redefine_notexists/01-redefine.xml rename to tests/dictionaries/80redefine_notexists/01-redefine.xml diff --git a/tests/flattener_dicos/80redefine_notexists/__init__.py b/tests/dictionaries/80redefine_notexists/__init__.py similarity index 100% rename from tests/flattener_dicos/80redefine_notexists/__init__.py rename to tests/dictionaries/80redefine_notexists/__init__.py diff --git a/tests/flattener_dicos/80separator_multi/00-base.xml b/tests/dictionaries/80separator_multi/00-base.xml similarity index 100% rename from tests/flattener_dicos/80separator_multi/00-base.xml rename to tests/dictionaries/80separator_multi/00-base.xml diff --git a/tests/flattener_dicos/80separator_multi/__init__.py b/tests/dictionaries/80separator_multi/__init__.py similarity index 100% rename from tests/flattener_dicos/80separator_multi/__init__.py rename to tests/dictionaries/80separator_multi/__init__.py diff --git a/tests/flattener_dicos/80separator_multi2/00-base.xml b/tests/dictionaries/80separator_multi2/00-base.xml similarity index 100% rename from tests/flattener_dicos/80separator_multi2/00-base.xml rename to tests/dictionaries/80separator_multi2/00-base.xml diff --git a/tests/flattener_dicos/80separator_multi2/01-base.xml b/tests/dictionaries/80separator_multi2/01-base.xml similarity index 100% rename from tests/flattener_dicos/80separator_multi2/01-base.xml rename to tests/dictionaries/80separator_multi2/01-base.xml diff --git a/tests/flattener_dicos/80separator_multi2/__init__.py b/tests/dictionaries/80separator_multi2/__init__.py similarity index 100% rename from tests/flattener_dicos/80separator_multi2/__init__.py rename to tests/dictionaries/80separator_multi2/__init__.py diff --git a/tests/flattener_dicos/80separator_nonexists/00-base.xml b/tests/dictionaries/80separator_nonexists/00-base.xml similarity index 100% rename from tests/flattener_dicos/80separator_nonexists/00-base.xml rename to tests/dictionaries/80separator_nonexists/00-base.xml diff --git a/tests/flattener_dicos/80separator_nonexists/__init__.py b/tests/dictionaries/80separator_nonexists/__init__.py similarity index 100% rename from tests/flattener_dicos/80separator_nonexists/__init__.py rename to tests/dictionaries/80separator_nonexists/__init__.py diff --git a/tests/flattener_dicos/80unknown_validenum/00-base.xml b/tests/dictionaries/80unknown_validenum/00-base.xml similarity index 100% rename from tests/flattener_dicos/80unknown_validenum/00-base.xml rename to tests/dictionaries/80unknown_validenum/00-base.xml diff --git a/tests/flattener_dicos/80unknown_validenum/__init__.py b/tests/dictionaries/80unknown_validenum/__init__.py similarity index 100% rename from tests/flattener_dicos/80unknown_validenum/__init__.py rename to tests/dictionaries/80unknown_validenum/__init__.py diff --git a/tests/flattener_dicos/80validenum_ouinon/00-base.xml b/tests/dictionaries/80validenum_ouinon/00-base.xml similarity index 100% rename from tests/flattener_dicos/80validenum_ouinon/00-base.xml rename to tests/dictionaries/80validenum_ouinon/00-base.xml diff --git a/tests/flattener_dicos/80validenum_ouinon/__init__.py b/tests/dictionaries/80validenum_ouinon/__init__.py similarity index 100% rename from tests/flattener_dicos/80validenum_ouinon/__init__.py rename to tests/dictionaries/80validenum_ouinon/__init__.py diff --git a/tests/flattener_dicos/80validenum_python_not_list/00-base.xml b/tests/dictionaries/80validenum_python_not_list/00-base.xml similarity index 100% rename from tests/flattener_dicos/80validenum_python_not_list/00-base.xml rename to tests/dictionaries/80validenum_python_not_list/00-base.xml diff --git a/tests/flattener_dicos/80validenum_python_not_list/__init__.py b/tests/dictionaries/80validenum_python_not_list/__init__.py similarity index 100% rename from tests/flattener_dicos/80validenum_python_not_list/__init__.py rename to tests/dictionaries/80validenum_python_not_list/__init__.py diff --git a/tests/flattener_dicos/80validenum_python_unknown/00-base.xml b/tests/dictionaries/80validenum_python_unknown/00-base.xml similarity index 100% rename from tests/flattener_dicos/80validenum_python_unknown/00-base.xml rename to tests/dictionaries/80validenum_python_unknown/00-base.xml diff --git a/tests/flattener_dicos/80validenum_python_unknown/__init__.py b/tests/dictionaries/80validenum_python_unknown/__init__.py similarity index 100% rename from tests/flattener_dicos/80validenum_python_unknown/__init__.py rename to tests/dictionaries/80validenum_python_unknown/__init__.py diff --git a/tests/flattener_dicos/80validenum_python_unknownvalue/00-base.xml b/tests/dictionaries/80validenum_python_unknownvalue/00-base.xml similarity index 100% rename from tests/flattener_dicos/80validenum_python_unknownvalue/00-base.xml rename to tests/dictionaries/80validenum_python_unknownvalue/00-base.xml diff --git a/tests/flattener_dicos/80validenum_python_unknownvalue/__init__.py b/tests/dictionaries/80validenum_python_unknownvalue/__init__.py similarity index 100% rename from tests/flattener_dicos/80validenum_python_unknownvalue/__init__.py rename to tests/dictionaries/80validenum_python_unknownvalue/__init__.py diff --git a/tests/flattener_dicos/88valid_enum_not_number/00-base.xml b/tests/dictionaries/88valid_enum_not_number/00-base.xml similarity index 100% rename from tests/flattener_dicos/88valid_enum_not_number/00-base.xml rename to tests/dictionaries/88valid_enum_not_number/00-base.xml diff --git a/tests/flattener_dicos/88valid_enum_not_number/__init__.py b/tests/dictionaries/88valid_enum_not_number/__init__.py similarity index 100% rename from tests/flattener_dicos/88valid_enum_not_number/__init__.py rename to tests/dictionaries/88valid_enum_not_number/__init__.py diff --git a/tests/flattener_dicos/88valid_enum_numberdefaultstring/00-base.xml b/tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml similarity index 100% rename from tests/flattener_dicos/88valid_enum_numberdefaultstring/00-base.xml rename to tests/dictionaries/88valid_enum_numberdefaultstring/00-base.xml diff --git a/tests/flattener_dicos/88valid_enum_numberdefaultstring/__init__.py b/tests/dictionaries/88valid_enum_numberdefaultstring/__init__.py similarity index 100% rename from tests/flattener_dicos/88valid_enum_numberdefaultstring/__init__.py rename to tests/dictionaries/88valid_enum_numberdefaultstring/__init__.py diff --git a/tests/flattener_dicos/__init__.py b/tests/dictionaries/__init__.py similarity index 100% rename from tests/flattener_dicos/__init__.py rename to tests/dictionaries/__init__.py diff --git a/tests/templates/11disabled_if_in_filelist/__init__.py b/tests/templates/11disabled_if_in_filelist/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/templates/11disabled_if_in_filelist/base.py b/tests/templates/11disabled_if_in_filelist/base.py deleted file mode 100644 index 37fb14df..00000000 --- a/tests/templates/11disabled_if_in_filelist/base.py +++ /dev/null @@ -1,21 +0,0 @@ -from tiramisu import * -from rougail.tiramisu import ConvertDynOptionDescription -import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') -option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) -option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) -option_5 = BoolOption(default=True, properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) -option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_10 = StrOption(name='group', doc='group', multi=False, default='root') -option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_12 = StrOption(name='name', doc='name', multi=False, default='/etc/file') -option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_16 = BoolOption(default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False) -option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) -option_8 = OptionDescription(name='files', doc='files', children=[option_9]) -option_7 = OptionDescription(name='test', doc='test', children=[option_8]) -option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) -option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/templates/11disabled_if_in_filelist_disabled/__init__.py b/tests/templates/11disabled_if_in_filelist_disabled/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/templates/11disabled_if_in_filelist_disabled/base.py b/tests/templates/11disabled_if_in_filelist_disabled/base.py deleted file mode 100644 index a1d97a8a..00000000 --- a/tests/templates/11disabled_if_in_filelist_disabled/base.py +++ /dev/null @@ -1,21 +0,0 @@ -from tiramisu import * -from rougail.tiramisu import ConvertDynOptionDescription -import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') -option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='oui', values=('oui', 'non')) -option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) -option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non')) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) -option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_10 = StrOption(name='group', doc='group', multi=False, default='root') -option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_12 = StrOption(name='name', doc='name', multi=False, default='/etc/file') -option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_16 = BoolOption(default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False) -option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) -option_8 = OptionDescription(name='files', doc='files', children=[option_9]) -option_7 = OptionDescription(name='test', doc='test', children=[option_8]) -option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) -option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/templates/20notemplating/__init__.py b/tests/templates/20notemplating/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/templates/20notemplating/base.py b/tests/templates/20notemplating/base.py deleted file mode 100644 index b37ec7dd..00000000 --- a/tests/templates/20notemplating/base.py +++ /dev/null @@ -1,19 +0,0 @@ -from tiramisu import * -from rougail.tiramisu import ConvertDynOptionDescription -import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') -option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='group', doc='group', multi=False, default='root') -option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/file') -option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_12 = StrOption(name='source', doc='source', multi=False, default='file') -option_13 = BoolOption(default=False, name='templating', doc='templating', multi=False) -option_14 = BoolOption(default=True, name='activate', doc='activate', multi=False) -option_7 = OptionDescription(name='file', doc='file', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) -option_6 = OptionDescription(name='files', doc='files', children=[option_7]) -option_5 = OptionDescription(name='test', doc='test', children=[option_6]) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) -option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/templates/20override/__init__.py b/tests/templates/20override/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/templates/20override/base.py b/tests/templates/20override/base.py deleted file mode 100644 index c420cb30..00000000 --- a/tests/templates/20override/base.py +++ /dev/null @@ -1,19 +0,0 @@ -from tiramisu import * -from rougail.tiramisu import ConvertDynOptionDescription -import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') -option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='group', doc='group', multi=False, default='root') -option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_10 = StrOption(name='name', doc='name', multi=False, default='/systemd/system/test.service.d/rougail.conf') -option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_12 = StrOption(name='source', doc='source', multi=False, default='test.service') -option_13 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_14 = BoolOption(default=True, name='activate', doc='activate', multi=False) -option_7 = OptionDescription(name='test_service', doc='test.service', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) -option_6 = OptionDescription(name='overrides', doc='overrides', children=[option_7]) -option_5 = OptionDescription(name='test', doc='test', children=[option_6]) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) -option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/templates/60extra_group/__init__.py b/tests/templates/60extra_group/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/templates/60extra_group/base.py b/tests/templates/60extra_group/base.py deleted file mode 100644 index d409ba80..00000000 --- a/tests/templates/60extra_group/base.py +++ /dev/null @@ -1,25 +0,0 @@ -from tiramisu import * -from rougail.tiramisu import ConvertDynOptionDescription -import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') -option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) -option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non', values=('oui', 'non')) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) -option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(properties=frozenset({'mandatory'}), name='description', doc='description', multi=True, default=['test']) -option_9 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode', doc='mode', multi=True, default_multi='pre') -option_7 = Leadership(name='description', doc='description', properties=frozenset({'normal'}), children=[option_8, option_9]) -option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_7]) -option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) -option_14 = StrOption(name='group', doc='group', multi=False, default='root') -option_15 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_16 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') -option_17 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_18 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_19 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_20 = BoolOption(default=True, name='activate', doc='activate', multi=False) -option_13 = OptionDescription(name='mailname', doc='mailname', children=[option_14, option_15, option_16, option_17, option_18, option_19, option_20]) -option_12 = OptionDescription(name='files', doc='files', children=[option_13]) -option_11 = OptionDescription(name='test', doc='test', children=[option_12]) -option_10 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_11]) -option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5, option_10]) diff --git a/tests/templates/70container_files/__init__.py b/tests/templates/70container_files/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/templates/70container_files/base.py b/tests/templates/70container_files/base.py deleted file mode 100644 index a012e8eb..00000000 --- a/tests/templates/70container_files/base.py +++ /dev/null @@ -1,27 +0,0 @@ -from tiramisu import * -from rougail.tiramisu import ConvertDynOptionDescription -import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') -option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) -option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='group', doc='group', multi=False, default='root') -option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') -option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_12 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_13 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_14 = BoolOption(default=True, name='activate', doc='activate', multi=False) -option_7 = OptionDescription(name='mailname', doc='mailname', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) -option_16 = StrOption(name='group', doc='group', multi=False, default='root') -option_17 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_18 = StrOption(name='name', doc='name', multi=False, default='/rougail.conf') -option_19 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_20 = StrOption(name='source', doc='source', multi=False, default='rougail.conf') -option_21 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_22 = BoolOption(default=True, name='activate', doc='activate', multi=False) -option_15 = OptionDescription(name='rougail_conf', doc='rougail.conf', children=[option_16, option_17, option_18, option_19, option_20, option_21, option_22]) -option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15]) -option_5 = OptionDescription(name='test', doc='test', children=[option_6]) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) -option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/templates/70container_files_symlink_multi/__init__.py b/tests/templates/70container_files_symlink_multi/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/templates/70container_files_symlink_multi/base.py b/tests/templates/70container_files_symlink_multi/base.py deleted file mode 100644 index 8d3caddc..00000000 --- a/tests/templates/70container_files_symlink_multi/base.py +++ /dev/null @@ -1,20 +0,0 @@ -from tiramisu import * -from rougail.tiramisu import ConvertDynOptionDescription -import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') -option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='file_name', doc='file_name', multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi='/etc/mailname2') -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) -option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_9 = StrOption(name='group', doc='group', multi=False, default='root') -option_10 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_11 = SymLinkOption(name='name', opt=option_4) -option_12 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_13 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_14 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_15 = BoolOption(default=True, name='activate', doc='activate', multi=False) -option_8 = OptionDescription(name='mailname', doc='mailname', children=[option_9, option_10, option_11, option_12, option_13, option_14, option_15]) -option_7 = OptionDescription(name='files', doc='files', children=[option_8]) -option_6 = OptionDescription(name='test', doc='test', children=[option_7]) -option_5 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_6]) -option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/templates/70container_files_symlink_multi/makedict/base.json b/tests/templates/70container_files_symlink_multi/makedict/base.json deleted file mode 100644 index e5344ac6..00000000 --- a/tests/templates/70container_files_symlink_multi/makedict/base.json +++ /dev/null @@ -1 +0,0 @@ -{"creole.general.file_name": ["/etc/mailname", "/etc/mailname2"], "containers.container0.files.file0.mkdir": false, "containers.container0.files.file0.name": ["/etc/mailname", "/etc/mailname2"], "containers.container0.files.file0.rm": false, "containers.container0.files.file0.source": "mailname", "containers.container0.files.file0.activate": true} \ No newline at end of file diff --git a/tests/templates/70container_files_symlink_multi_variable/__init__.py b/tests/templates/70container_files_symlink_multi_variable/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/templates/70container_files_symlink_multi_variable/base.py b/tests/templates/70container_files_symlink_multi_variable/base.py deleted file mode 100644 index 3fdeb247..00000000 --- a/tests/templates/70container_files_symlink_multi_variable/base.py +++ /dev/null @@ -1,22 +0,0 @@ -from tiramisu import * -from rougail.tiramisu import ConvertDynOptionDescription -import imp -func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') -option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='file_name', doc='file_name', multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi='/etc/mailname2') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='var', doc='var', multi=True, default=['mailname', 'mailname2'], default_multi='mailname2') -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) -option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_10 = StrOption(name='group', doc='group', multi=False, default='root') -option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_12 = SymLinkOption(name='name', opt=option_4) -option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_14 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_15 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_16 = SymLinkOption(name='variable', opt=option_5) -option_17 = BoolOption(default=True, name='activate', doc='activate', multi=False) -option_9 = OptionDescription(name='mailname', doc='mailname', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17]) -option_8 = OptionDescription(name='files', doc='files', children=[option_9]) -option_7 = OptionDescription(name='test', doc='test', children=[option_8]) -option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) -option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/templates/__init__.py b/tests/templates/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/test_1_flattener.py b/tests/test_1_flattener.py index f83798bc..d192702f 100644 --- a/tests/test_1_flattener.py +++ b/tests/test_1_flattener.py @@ -7,11 +7,11 @@ from json import load from rougail import objspace, annotator from rougail.xml_compare import xml_compare from rougail.error import DictConsistencyError -from rougail.config import dtdfilename, variable_namespace +from rougail.config import Config -dico_dirs = 'tests/flattener_dicos' +dico_dirs = 'tests/dictionaries' test_ok = set() @@ -67,12 +67,12 @@ def compare_xml(exported_xmlfile, expected_xmlfile): def launch_flattener(test_dir, test_ok=False): debug = False #debug = True - eolobj = objspace.CreoleObjSpace(dtdfilename) + eolobj = objspace.CreoleObjSpace(Config['dtdfilename']) dirs = [test_dir] subfolder = join(test_dir, 'subfolder') if isdir(subfolder): dirs.append(subfolder) - eolobj.create_or_populate_from_xml(variable_namespace, dirs) + eolobj.create_or_populate_from_xml(Config['variable_namespace'], dirs) subfolder = join(test_dir, 'extra_dirs', 'extra') if isdir(subfolder): eolobj.create_or_populate_from_xml('extra', [subfolder]) diff --git a/tests/test_2_makedict.py b/tests/test_2_makedict.py index 02d43a14..5657d98e 100644 --- a/tests/test_2_makedict.py +++ b/tests/test_2_makedict.py @@ -7,7 +7,7 @@ from json import dump, load, dumps, loads from tiramisu import Config -dico_dirs = 'tests/flattener_dicos' +dico_dirs = 'tests/dictionaries' test_ok = set() diff --git a/tests/test_3_template.py b/tests/test_3_template.py index cafc8156..dbaf974c 100644 --- a/tests/test_3_template.py +++ b/tests/test_3_template.py @@ -6,11 +6,10 @@ from lxml.etree import parse from tiramisu import Config from rougail import template -from rougail.config import dtdfilename -template_dirs = 'tests/templates' -test_ok = [f for f in listdir(template_dirs) if not f.startswith('_')] +template_dirs = 'tests/dictionaries' +test_ok = [f for f in listdir(template_dirs) if not f.startswith('_') and isdir(join(template_dirs, f, 'tmpl'))] #test_ok = ['60extra_group'] @@ -40,7 +39,7 @@ async def test_dictionary(test_dir): test_dir = join(template_dirs, test_dir) tmp_dir = join(test_dir, 'tmp') - modulepath = test_dir.replace('/', '.') + '.base' + modulepath = test_dir.replace('/', '.') + '.tiramisu.base' mod = __import__(modulepath) for token in modulepath.split(".")[1:]: mod = getattr(mod, token)