diff --git a/creole/annotator.py b/creole/annotator.py index f16db7e..12415f1 100644 --- a/creole/annotator.py +++ b/creole/annotator.py @@ -477,6 +477,7 @@ class SpaceAnnotator(object): self.filter_check() self.filter_condition() self.convert_valid_enums() + self.convert_check() self.convert_autofill() self.remove_empty_families() self.change_variable_mode() @@ -484,8 +485,11 @@ class SpaceAnnotator(object): self.filter_separators() self.absolute_path_for_symlink_in_containers() self.convert_helps() - #if hasattr(self.space, 'constraints'): - # print(vars(self.space.constraints)) + if hasattr(self.space, 'constraints'): + del self.space.constraints.index + if vars(self.space.constraints): + raise Exception('constraints again?') + del self.space.constraints def absolute_path_for_symlink_in_containers(self): if not hasattr(self.space, 'containers'): @@ -717,20 +721,21 @@ class SpaceAnnotator(object): del self.force_value[path] def convert_valid_enums(self): # pylint: disable=C0111 - if hasattr(self.space, 'variables'): - for variables in self.space.variables.values(): - namespace = variables.name - if hasattr(variables, 'family'): - for family in variables.family.values(): - if hasattr(family, 'variable'): - for variable in family.variable.values(): - if isinstance(variable, self.objectspace.Leadership): - for follower in variable.variable: - path = '{}.{}.{}.{}'.format(namespace, family.name, variable.name, follower.name) - self._convert_valid_enum(follower, path) - else: - path = '{}.{}.{}'.format(namespace, family.name, variable.name) - self._convert_valid_enum(variable, path) + if not hasattr(self.space, 'variables'): + return + for variables in self.space.variables.values(): + namespace = variables.name + if hasattr(variables, 'family'): + for family in variables.family.values(): + if hasattr(family, 'variable'): + for variable in family.variable.values(): + if isinstance(variable, self.objectspace.Leadership): + for follower in variable.variable: + path = '{}.{}.{}.{}'.format(namespace, family.name, variable.name, follower.name) + self._convert_valid_enum(follower, path) + else: + path = '{}.{}.{}'.format(namespace, family.name, variable.name) + self._convert_valid_enum(variable, path) # valid_enums must be empty now (all information are store in objects) if self.valid_enums: raise CreoleDictConsistencyError(_('valid_enum sets for unknown variables {}').format(self.valid_enums.keys())) @@ -991,6 +996,9 @@ class SpaceAnnotator(object): remove_params.append(param_idx) except TypeError as err: raise CreoleDictConsistencyError(_('cannot load checkval value for variable {}: {}').format(check.target, err)) + if proposed_value_type: + # no more supported + raise CreoleDictConsistencyError(_('cannot load checkval value for variable {}, no more supported').format(check.target)) remove_params.sort(reverse=True) for param_idx in remove_params: del check.param[param_idx] @@ -1021,7 +1029,6 @@ class SpaceAnnotator(object): remove_indexes.sort(reverse=True) for idx in remove_indexes: del space[idx] - #convert level to "warnings_only" and hidden to "transitive" for check in space: if check.level == 'warning': @@ -1037,6 +1044,48 @@ class SpaceAnnotator(object): param.hidden = None check.transitive = transitive + if not self.space.constraints.check: + del self.space.constraints.check + + + def convert_check(self): + if not hasattr(self.space, 'constraints') or not hasattr(self.space.constraints, 'check'): + return + for check in self.space.constraints.check: + variable = self.paths.get_variable_obj(check.target) + check_ = self.objectspace.check() + check_.type = 'calculation' + name = check.name + if name == 'valid_differ': + name = 'valid_not_equal' + elif name == 'valid_network_netmask': + params_len = 1 + if len(check.param) != params_len: + raise CreoleLoaderError(_('{} must have {} param').format(name, params_len)) + elif name == 'valid_ipnetmask': + params_len = 1 + if len(check.param) != params_len: + raise CreoleLoaderError(_('{} must have {} param').format(name, params_len)) + name = 'valid_ip_netmask' + elif name == 'valid_broadcast': + params_len = 2 + if len(check.param) != params_len: + raise CreoleLoaderError(_('{} must have {} param').format(name, params_len)) + elif name == 'valid_in_network': + params_len = 2 + if len(check.param) != params_len: + raise CreoleLoaderError(_('{} must have {} param').format(name, params_len)) + check_.name = name + check_.warnings_only = check.warnings_only + check_.transitive = check.transitive + if hasattr(check, 'param'): + check_.param = check.param + if not hasattr(variable, 'check'): + variable.check = [] + variable.check.append(check_) + del self.space.constraints.check + + def convert_fill(self, fill_space, space): # pylint: disable=C0111,R0912 fills = {} # sort fill/auto by index diff --git a/creole/loader.py b/creole/loader.py index 034823a..7fee10f 100644 --- a/creole/loader.py +++ b/creole/loader.py @@ -6,7 +6,7 @@ from os import listdir #from ast import literal_eval from lxml.etree import parse, DTD -from tiramisu.option import (UnicodeOption, OptionDescription, PortOption, +from tiramisu.option import (StrOption, OptionDescription, PortOption, IntOption, ChoiceOption, BoolOption, SymLinkOption, IPOption, NetworkOption, NetmaskOption, DomainnameOption, BroadcastOption, URLOption, EmailOption, FilenameOption, UsernameOption, DateOption, @@ -46,7 +46,7 @@ def convert_tiramisu_value(value, obj): raise Exception('unknown value {} while trying to cast {} to boolean'.format(value, obj)) return prop[value] - func = {IntOption: int, UnicodeOption: str, PortOption: str, + func = {IntOption: int, StrOption: str, PortOption: str, DomainnameOption: str, EmailOption: str, URLOption: str, IPOption: str, NetmaskOption: str, NetworkOption: str, BroadcastOption: str, FilenameOption: str, @@ -61,7 +61,7 @@ def convert_tiramisu_value(value, obj): CONVERT_OPTION = {'number': dict(opttype=IntOption), 'choice': dict(opttype=ChoiceOption), - 'string': dict(opttype=UnicodeOption), + 'string': dict(opttype=StrOption), 'password': dict(opttype=PasswordOption), 'mail': dict(opttype=EmailOption), 'boolean': dict(opttype=BoolOption), @@ -119,7 +119,7 @@ class PopulateTiramisuObjects(object): if set(attr.itervalues()) == set(['True', 'False']): self.booleans.append(attr.name) - def make_tiramisu_objects(self, xmlroot, creolefunc_file, load_extra=True): + def make_tiramisu_objects(self, xmlroot, creolefunc_file): elt = Elt({'name': 'baseoption'}) family = Family(elt, self.booleans, self.storage) self.storage.add('.', family) @@ -142,8 +142,6 @@ class PopulateTiramisuObjects(object): # `actions` family has to be loaded at the very end # because it may use `creole` or `extra` variables for xml in xmlelts_: - if not load_extra and xml.attrib['name'] not in ['creole', 'containers']: - continue if xml.attrib['name'] == 'creole': xmlelts.insert(0, xml) elif xml.attrib['name'] == 'actions': @@ -155,12 +153,9 @@ class PopulateTiramisuObjects(object): else: xmlelts = xmlelts_ for xmlelt in xmlelts: - if xmlelt.tag == 'family': - self._iter_family(xmlelt, family) - elif xmlelt.tag == 'constraints': - self._iter_constraints(xmlelt, load_extra) - else: + if xmlelt.tag != 'family': raise CreoleLoaderError(_('unknown tag {}').format(xmlelt.tag)) + self._iter_family(xmlelt, family) def _populate_variable(self, elt, subpath, is_follower, is_leader): variable = Variable(elt, self.booleans, self.storage, is_follower, is_leader, self.eosfunc) @@ -188,164 +183,6 @@ class PopulateTiramisuObjects(object): subpath += '.' + elt.attrib['name'] return subpath - def _iter_constraints(self, xmlelt, load_extra): - for elt in xmlelt: - if elt.tag == 'fill': - self._parse_fill(elt, load_extra) - elif elt.tag == 'check': - self._parse_check(elt, load_extra) - else: - raise CreoleLoaderError(_('unknown constraint {}').format(elt.tag)) - - def _check_extra(self, variable, load_extra): - if load_extra: - return True - return variable.startswith('creole.') or variable.startswith('containers.') - - - def _parse_fill(self, elt, load_extra): - if not self._check_extra(elt.attrib['target'], load_extra): - return - callback = getattr(self.eosfunc, elt.attrib['name']) - callback_params = {} - for param in elt: - name = param.attrib.get('name', '') - if param.attrib['type'] == 'string': - value = str(param.text) - elif param.attrib['type'] == 'eole': - hidden = param.attrib['hidden'] - if hidden == 'True': - hidden = False - elif hidden == 'False': - hidden = True - else: - raise CreoleLoaderError(_('unknown hidden boolean {}').format(hidden)) - if not self._check_extra(param.text, load_extra): - return - value = [self.storage.get(param.text), hidden] - elif param.attrib['type'] == 'number': - value = int(param.text) - elif param.attrib['type'] == 'context': - value = (None,) - else: - raise CreoleLoaderError(_('unknown param type {} in fill to {}').format(param.attrib['type'], elt.attrib['target'])) - callback_params.setdefault(name, []).append(value) - if callback_params == {}: - callback_params = None - self.storage.add_callback(elt.attrib['target'], callback, callback_params) - - def _parse_check(self, elt, load_extra): - if not self._check_extra(elt.attrib['target'], load_extra): - return - all_param_eole = True - for param in elt: - if param.attrib.get('type') != 'eole': - all_param_eole = False - break - if elt.attrib['name'] == 'valid_enum': - # only for valid_enum with checkval to True - if len(elt) != 1: - raise CreoleLoaderError(_('valid_enum cannot have more than one param for {}').format(elt.attrib['target'])) - if elt[0].attrib['type'] == 'eole': - proposed = elt[0].text - type_ = 'eole' - else: - #proposed_value = literal_eval(elt[0].text) - proposed_value = eval(elt[0].text) - proposed = tuple(proposed_value) - type_ = 'string' - self.storage.add_information(elt.attrib['target'], 'proposed_value', {'value': proposed, 'type': type_}) - - validator = getattr(self.eosfunc, elt.attrib['name']) - elif elt.attrib['name'] == 'valid_differ' and all_param_eole: - if (HIGH_COMPATIBILITY and len(elt) not in [0, 1]) or (not HIGH_COMPATIBILITY and len(elt) != 1): - raise CreoleLoaderError(_('valid_differ length should be 1')) - if HIGH_COMPATIBILITY and len(elt) == 1: - if not self._check_extra(elt[0].text, load_extra): - return - variables = [self.storage.get(elt[0].text)] - else: - variables = [] - self.storage.add_consistency(elt.attrib['target'], - 'not_equal', - variables, - elt.attrib['warnings_only'], - elt.attrib['transitive']) - elif elt.attrib['name'] == 'valid_networknetmask': - if len(elt) != 1: - raise CreoleLoaderError(_('valid_networknetmask length should be 1')) - if not all_param_eole: - raise CreoleLoaderError(_('valid_networknetmask must have only eole variable')) - variables = [self.storage.get(elt[0].text)] - self.storage.add_consistency(elt.attrib['target'], - 'network_netmask', - variables, - elt.attrib['warnings_only'], - elt.attrib['transitive']) - elif elt.attrib['name'] == 'valid_ipnetmask': - if len(elt) != 1: - raise CreoleLoaderError(_('valid_ipnetmask length should be 1')) - if not all_param_eole: - raise CreoleLoaderError(_('valid_ipnetmask must have only eole variable')) - if not self._check_extra(elt[0].text, load_extra): - return - variables = [self.storage.get(elt[0].text)] - self.storage.add_consistency(elt.attrib['target'], - 'ip_netmask', - variables, - elt.attrib['warnings_only'], - elt.attrib['transitive']) - elif elt.attrib['name'] == 'valid_broadcast': - if len(elt) != 2: - raise CreoleLoaderError(_('valid_broadcast length should be 2')) - if not all_param_eole: - raise CreoleLoaderError(_('valid_broadcast must have only eole variable')) - if not self._check_extra(elt[0].text, load_extra): - return - variables = [self.storage.get(elt[0].text)] - if not self._check_extra(elt[1].text, load_extra): - return - variables.append(self.storage.get(elt[1].text)) - self.storage.add_consistency(elt.attrib['target'], - 'broadcast', - variables, - elt.attrib['warnings_only'], - elt.attrib['transitive']) - elif elt.attrib['name'] == 'valid_in_network': - if len(elt) != 2: - raise CreoleLoaderError(_('valid_in_network length should be 2')) - if not all_param_eole: - raise CreoleLoaderError(_('valid_in_network must have only eole variable')) - if not self._check_extra(elt[0].text, load_extra): - return - variables = [self.storage.get(elt[0].text)] - if not self._check_extra(elt[1].text, load_extra): - return - variables.append(self.storage.get(elt[1].text)) - self.storage.add_consistency(elt.attrib['target'], - 'in_network', - variables, - elt.attrib['warnings_only'], - elt.attrib['transitive']) - else: - validator = getattr(self.eosfunc, elt.attrib['name']) - validator_params = {} - for param in elt: - text = param.text - if param.attrib['type'] == 'eole': - hidden = param.attrib.get('hidden', 'True') - if hidden == 'True': - hidden = False - elif hidden == 'False': - hidden = True - else: - raise CreoleLoaderError(_('unknown hidden boolean {}').format(hidden)) - if not self._check_extra(text, load_extra): - return - text = [self.storage.get(text), hidden] - validator_params.setdefault(param.attrib.get('name', ''), []).append(text) - self.storage.add_validator(elt.attrib['target'], validator, validator_params) - def _iter_leader(self, leader, subpath): subpath = self._build_path(subpath, leader) family = Family(leader, self.booleans, self.storage) @@ -461,18 +298,10 @@ class ElementStorage: raise CreoleLoaderError(_('path already loaded {}').format(path)) self.paths[path] = elt - def add_callback(self, path, callback, callback_params): - elt = self.get(path) - elt.add_callback(callback, callback_params) - def add_information(self, path, name, information): elt = self.get(path) elt.add_information(name, information) - def add_validator(self, path, validator, validator_params): - elt = self.get(path) - elt.add_validator(validator, validator_params) - def add_consistency(self, path, consistence, variables, warnings_only, transitive): elt = self.get(path) elt.add_consistency(consistence, variables, warnings_only, transitive) @@ -508,9 +337,7 @@ class Variable(Common): self.option = None self.informations = {} self.attrib = {} - self.callbacks = [] self.requires = [] - self.validator = None self.consistencies = [] self.attrib['properties'] = [] self.eosfunc = eosfunc @@ -559,28 +386,37 @@ class Variable(Common): else: self.attrib['properties'].append(child.text) elif child.tag == 'value': - if "type" in child.attrib: - type_ = CONVERT_OPTION[child.attrib['type']]['opttype'] - else: - type_ = self.object_type - if self.attrib['multi'] and not is_follower: - if 'default' not in self.attrib: - self.attrib['default'] = [] - value = convert_tiramisu_value(child.text, type_) - self.attrib['default'].append(value) - if 'default_multi' not in self.attrib and not is_leader: - self.attrib['default_multi'] = value - else: - if 'default' in self.attrib: - raise CreoleLoaderError(_('default value already set for {}' - '').format(self.attrib['path'])) - value = convert_tiramisu_value(child.text, type_) - if value is None: # and (elt.attrib['type'] != 'choice' or value not in self.attrib['values']): - value = u'' - if is_follower: - self.attrib['default_multi'] = value + if child.attrib.get('type') == 'calculation': + if child.text.strip(): + self.attrib['default'] = (child.text.strip(),) else: - self.attrib['default'] = value + params = [] + for param in child: + params.append(self.parse_param(param)) + self.attrib['default'] = (child.attrib['name'], params) + else: + if "type" in child.attrib: + type_ = CONVERT_OPTION[child.attrib['type']]['opttype'] + else: + type_ = self.object_type + if self.attrib['multi'] and not is_follower: + if 'default' not in self.attrib: + self.attrib['default'] = [] + value = convert_tiramisu_value(child.text, type_) + self.attrib['default'].append(value) + if 'default_multi' not in self.attrib and not is_leader: + self.attrib['default_multi'] = value + else: + if 'default' in self.attrib: + raise CreoleLoaderError(_('default value already set for {}' + '').format(self.attrib['path'])) + value = convert_tiramisu_value(child.text, type_) + if value is None: # and (elt.attrib['type'] != 'choice' or value not in self.attrib['values']): + value = u'' + if is_follower: + self.attrib['default_multi'] = value + else: + self.attrib['default'] = value if 'initkwargs' in convert_option: self.attrib.update(convert_option['initkwargs']) if elt.attrib['type'] == 'symlink': @@ -588,20 +424,33 @@ class Variable(Common): del self.attrib['multi'] self.attrib['opt'] = storage.get(self.attrib['opt']) + def parse_param(self, param): + name = param.attrib.get('name', '') + if param.attrib['type'] == 'string': + value = param.text + elif param.attrib['type'] == 'eole': + hidden = param.attrib['hidden'] + if hidden == 'True': + hidden = False + elif hidden == 'False': + hidden = True + else: + raise CreoleLoaderError(_('unknown hidden boolean {}').format(hidden)) + value = [param.text, hidden] + elif param.attrib['type'] == 'number': + value = int(param.text) + else: + raise CreoleLoaderError(_('unknown param type {}').format(param.attrib['type'])) + return(name, value) + def add_information(self, key, value): if key in self.informations: raise CreoleLoaderError(_('key already exists in information {}').format(key)) self.informations[key] = value - def add_callback(self, callback, callback_params): - self.callbacks.append((callback, callback_params)) - def add_requires(self, requires): self.requires.extend(requires) - def add_validator(self, validator, validator_params): - self.validator = (validator, validator_params) - def add_consistency(self, consistence, variables, warnings_only, transitive): self.consistencies.append((consistence, variables, warnings_only, transitive)) @@ -627,12 +476,48 @@ class Variable(Common): return new_params return params + def build_default(self): + if 'default' in self.attrib: + default = self.attrib['default'] + if isinstance(default, tuple): + #('calc_val', [('', ['creole.general.mode_conteneur_actif1', False])]) + args = [] + kwargs = {} + if len(default) == 2: + for param in default[1]: + if isinstance(param[1], list): + value = ParamOption(self.storage.get(param[1][0]).get(), notraisepropertyerror=param[1][1]) + else: + value = ParamValue(param[1]) + if not param[0]: + args.append(value) + else: + kwargs[param[0]] = value + + self.attrib['default'] = Calculation(getattr(self.eosfunc, default[0]), + Params(tuple(args), + kwargs=kwargs)) + #for index, obj in enumerate(self.attrib.get('values', [])): + # print(obj) + #if isinstance(prop, tuple): + # action, kwargs = prop + # kwargs['condition'] = ParamOption(self.storage.get(kwargs['condition']).get(), todict=True) + # prop = Calculation(calc_value, + # Params(action, + # kwargs=kwargs)) + # self.attrib['properties'][index] = prop + #if self.attrib['properties']: + # self.attrib['properties'] = tuple(self.attrib['properties']) + #else: + # del self.attrib['properties'] + def get(self): if self.option is None: if self.object_type is SymLinkOption: self.attrib['opt'] = self.attrib['opt'].get() else: self.build_properties() + self.build_default() #for callback, callback_params in self.callbacks: # self.attrib['callback'] = callback # self.attrib['callback_params'] = self.build_params(callback_params) diff --git a/tests/flattener_dicos/00load_autofreeze/result/00-base.xml b/tests/flattener_dicos/00load_autofreeze/result/00-base.xml index a65f4f2..5480153 100644 --- a/tests/flattener_dicos/00load_autofreeze/result/00-base.xml +++ b/tests/flattener_dicos/00load_autofreeze/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml b/tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml index 343611e..c7505ff 100644 --- a/tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml +++ b/tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/00load_autosave/result/00-base.xml b/tests/flattener_dicos/00load_autosave/result/00-base.xml index 2bb9f4a..f9a036d 100644 --- a/tests/flattener_dicos/00load_autosave/result/00-base.xml +++ b/tests/flattener_dicos/00load_autosave/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml b/tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml index 9e66dcb..e20230d 100644 --- a/tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml +++ b/tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml @@ -1,6 +1,5 @@ - expert diff --git a/tests/flattener_dicos/00load_comment/result/00-base.xml b/tests/flattener_dicos/00load_comment/result/00-base.xml index 93e98eb..7231f21 100644 --- a/tests/flattener_dicos/00load_comment/result/00-base.xml +++ b/tests/flattener_dicos/00load_comment/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/00load_notype/result/00-base.xml b/tests/flattener_dicos/00load_notype/result/00-base.xml index 4fe83fc..68bd88a 100644 --- a/tests/flattener_dicos/00load_notype/result/00-base.xml +++ b/tests/flattener_dicos/00load_notype/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/00load_save/result/00-base.xml b/tests/flattener_dicos/00load_save/result/00-base.xml index 93e98eb..7231f21 100644 --- a/tests/flattener_dicos/00load_save/result/00-base.xml +++ b/tests/flattener_dicos/00load_save/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/00load_subfolder/result/00-base.xml b/tests/flattener_dicos/00load_subfolder/result/00-base.xml index 93e54a7..fb91ca9 100644 --- a/tests/flattener_dicos/00load_subfolder/result/00-base.xml +++ b/tests/flattener_dicos/00load_subfolder/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/01auto_base/result/00-base.xml b/tests/flattener_dicos/01auto_base/result/00-base.xml index 1fe6c98..6544d72 100644 --- a/tests/flattener_dicos/01auto_base/result/00-base.xml +++ b/tests/flattener_dicos/01auto_base/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml b/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml index c9777ed..7fa50be 100644 --- a/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml +++ b/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml b/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml index 0b2dab2..01c6018 100644 --- a/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml +++ b/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/01fill_autosave/result/00-base.xml b/tests/flattener_dicos/01fill_autosave/result/00-base.xml index d23f21b..6c4300d 100644 --- a/tests/flattener_dicos/01fill_autosave/result/00-base.xml +++ b/tests/flattener_dicos/01fill_autosave/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/01fill_base/result/00-base.xml b/tests/flattener_dicos/01fill_base/result/00-base.xml index 1fe6c98..6544d72 100644 --- a/tests/flattener_dicos/01fill_base/result/00-base.xml +++ b/tests/flattener_dicos/01fill_base/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml b/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml index 679157e..6594c91 100644 --- a/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml +++ b/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/01fill_mandatory/result/00-base.xml b/tests/flattener_dicos/01fill_mandatory/result/00-base.xml index 2d8390e..f22cd35 100644 --- a/tests/flattener_dicos/01fill_mandatory/result/00-base.xml +++ b/tests/flattener_dicos/01fill_mandatory/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/01fill_number/result/00-base.xml b/tests/flattener_dicos/01fill_number/result/00-base.xml index cfc2e96..76bae2a 100644 --- a/tests/flattener_dicos/01fill_number/result/00-base.xml +++ b/tests/flattener_dicos/01fill_number/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/01fill_optional/result/00-base.xml b/tests/flattener_dicos/01fill_optional/result/00-base.xml index 1fe6c98..6544d72 100644 --- a/tests/flattener_dicos/01fill_optional/result/00-base.xml +++ b/tests/flattener_dicos/01fill_optional/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/01separator_base/result/00-base.xml b/tests/flattener_dicos/01separator_base/result/00-base.xml index f4c13c9..d5863e5 100644 --- a/tests/flattener_dicos/01separator_base/result/00-base.xml +++ b/tests/flattener_dicos/01separator_base/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/01separator_neverhidden/result/00-base.xml b/tests/flattener_dicos/01separator_neverhidden/result/00-base.xml index 2848833..eb290e2 100644 --- a/tests/flattener_dicos/01separator_neverhidden/result/00-base.xml +++ b/tests/flattener_dicos/01separator_neverhidden/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10autosave_hidden/result/00-base.xml b/tests/flattener_dicos/10autosave_hidden/result/00-base.xml index 3e85188..6af1c9d 100644 --- a/tests/flattener_dicos/10autosave_hidden/result/00-base.xml +++ b/tests/flattener_dicos/10autosave_hidden/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml b/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml index 345adf1..8835471 100644 --- a/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml +++ b/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/10check_base/result/00-base.xml b/tests/flattener_dicos/10check_base/result/00-base.xml index 8ab96ed..dbd4abf 100644 --- a/tests/flattener_dicos/10check_base/result/00-base.xml +++ b/tests/flattener_dicos/10check_base/result/00-base.xml @@ -1,11 +1,5 @@ - - - 0 - 100 - - normal @@ -15,6 +9,10 @@ b + + 0 + 100 + normal diff --git a/tests/flattener_dicos/10check_option/result/00-base.xml b/tests/flattener_dicos/10check_option/result/00-base.xml index e8055f7..3f54476 100644 --- a/tests/flattener_dicos/10check_option/result/00-base.xml +++ b/tests/flattener_dicos/10check_option/result/00-base.xml @@ -1,11 +1,5 @@ - - - 0 - creole.general.int2 - - normal @@ -20,6 +14,10 @@ 100 + + 0 + creole.general.int2 + normal diff --git a/tests/flattener_dicos/10check_optional/result/00-base.xml b/tests/flattener_dicos/10check_optional/result/00-base.xml index 7b11d89..6c2da63 100644 --- a/tests/flattener_dicos/10check_optional/result/00-base.xml +++ b/tests/flattener_dicos/10check_optional/result/00-base.xml @@ -1,11 +1,5 @@ - - - creole.general.int2 - - - normal @@ -15,6 +9,10 @@ b + + creole.general.int2 + + normal diff --git a/tests/flattener_dicos/10check_valid_differ/result/00-base.xml b/tests/flattener_dicos/10check_valid_differ/result/00-base.xml index 75717d1..449999a 100644 --- a/tests/flattener_dicos/10check_valid_differ/result/00-base.xml +++ b/tests/flattener_dicos/10check_valid_differ/result/00-base.xml @@ -1,14 +1,12 @@ - - - creole.general.mode_conteneur_actif1 - - normal + + creole.general.mode_conteneur_actif1 + oui non mandatory diff --git a/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml b/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml index e348591..947f6c6 100644 --- a/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml +++ b/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml @@ -1,19 +1,5 @@ - - - creole.general.mode_conteneur_actif1 - - - creole.general.mode_conteneur_actif2 - - - creole.general.mode_conteneur_actif1 - - - creole.general.mode_conteneur_actif2 - - normal @@ -39,6 +25,18 @@ non + + creole.general.mode_conteneur_actif1 + + + creole.general.mode_conteneur_actif2 + + + creole.general.mode_conteneur_actif1 + + + creole.general.mode_conteneur_actif2 + mandatory normal oui diff --git a/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml b/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml index fa67067..f12591c 100644 --- a/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml +++ b/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml @@ -1,13 +1,5 @@ - - - creole.general.mode_conteneur_actif1 - - - creole.general.mode_conteneur_actif2 - - normal @@ -33,6 +25,12 @@ non + + creole.general.mode_conteneur_actif1 + + + creole.general.mode_conteneur_actif2 + mandatory normal oui diff --git a/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml b/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml index 9b4c482..dfdd4d0 100644 --- a/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml +++ b/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml @@ -1,10 +1,5 @@ - - - creole.general.adresse_ip_eth0 - - basic @@ -20,6 +15,9 @@ basic + + creole.general.adresse_ip_eth0 + mandatory basic diff --git a/tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml b/tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml index 9d0aadb..f92fed8 100644 --- a/tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml +++ b/tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml b/tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml index 7924b2e..0e104d2 100644 --- a/tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml +++ b/tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml b/tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml index b3bc555..2a4ffc7 100644 --- a/tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml +++ b/tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml b/tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml index 9eae9e6..6c3b096 100644 --- a/tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml +++ b/tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml b/tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml index 9d0aadb..f92fed8 100644 --- a/tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml +++ b/tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_frozenifin/result/00-base.xml b/tests/flattener_dicos/10load_frozenifin/result/00-base.xml index 00d19e8..bd653ec 100644 --- a/tests/flattener_dicos/10load_frozenifin/result/00-base.xml +++ b/tests/flattener_dicos/10load_frozenifin/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml b/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml index db4fae9..09ddcfe 100644 --- a/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml +++ b/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_frozenifin_multiparam/result/00-base.xml b/tests/flattener_dicos/10load_frozenifin_multiparam/result/00-base.xml index b43bdeb..dd5c238 100644 --- a/tests/flattener_dicos/10load_frozenifin_multiparam/result/00-base.xml +++ b/tests/flattener_dicos/10load_frozenifin_multiparam/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_frozenifin_noexist/result/00-base.xml b/tests/flattener_dicos/10load_frozenifin_noexist/result/00-base.xml index aa21e71..138eed2 100644 --- a/tests/flattener_dicos/10load_frozenifin_noexist/result/00-base.xml +++ b/tests/flattener_dicos/10load_frozenifin_noexist/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_mandatoryifin/result/00-base.xml b/tests/flattener_dicos/10load_mandatoryifin/result/00-base.xml index 71f0e32..5eda309 100644 --- a/tests/flattener_dicos/10load_mandatoryifin/result/00-base.xml +++ b/tests/flattener_dicos/10load_mandatoryifin/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_masterslaves/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves/result/00-base.xml index c1967d8..787dae2 100644 --- a/tests/flattener_dicos/10load_masterslaves/result/00-base.xml +++ b/tests/flattener_dicos/10load_masterslaves/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_masterslaves_default_multi/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves_default_multi/result/00-base.xml index 3aa712e..8811189 100644 --- a/tests/flattener_dicos/10load_masterslaves_default_multi/result/00-base.xml +++ b/tests/flattener_dicos/10load_masterslaves_default_multi/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/result/00-base.xml index 76020eb..2108d61 100644 --- a/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/result/00-base.xml +++ b/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_masterslaves_normalize_family/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves_normalize_family/result/00-base.xml index 0170970..eca99d8 100644 --- a/tests/flattener_dicos/10load_masterslaves_normalize_family/result/00-base.xml +++ b/tests/flattener_dicos/10load_masterslaves_normalize_family/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10load_multivalue/result/00-base.xml b/tests/flattener_dicos/10load_multivalue/result/00-base.xml index 9cdbd4f..cf58390 100644 --- a/tests/flattener_dicos/10load_multivalue/result/00-base.xml +++ b/tests/flattener_dicos/10load_multivalue/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml b/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml index 9c3e585..1ffed95 100644 --- a/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml +++ b/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml b/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml index 39781ec..c91d911 100644 --- a/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml +++ b/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10masterslave_mandatoryslave/result/00-base.xml b/tests/flattener_dicos/10masterslave_mandatoryslave/result/00-base.xml index 06ac596..959fddf 100644 --- a/tests/flattener_dicos/10masterslave_mandatoryslave/result/00-base.xml +++ b/tests/flattener_dicos/10masterslave_mandatoryslave/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml b/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml index 532fb64..6c406af 100644 --- a/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml +++ b/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/10masterslave_multi/result/00-base.xml b/tests/flattener_dicos/10masterslave_multi/result/00-base.xml index 7053a6f..cb83482 100644 --- a/tests/flattener_dicos/10masterslave_multi/result/00-base.xml +++ b/tests/flattener_dicos/10masterslave_multi/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10masterslaves_append/result/00-base.xml b/tests/flattener_dicos/10masterslaves_append/result/00-base.xml index db3115c..b3b32e5 100644 --- a/tests/flattener_dicos/10masterslaves_append/result/00-base.xml +++ b/tests/flattener_dicos/10masterslaves_append/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml b/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml index 83e72ba..9835cc5 100644 --- a/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml +++ b/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml b/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml index ac787a6..3aad830 100644 --- a/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml +++ b/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml b/tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml index 4eecad7..a9cdddf 100644 --- a/tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml +++ b/tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml @@ -1,6 +1,5 @@ - expert diff --git a/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml b/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml index 1073a8d..cb98751 100644 --- a/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml +++ b/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10valid_enum_accent/00-base.xml b/tests/flattener_dicos/10valid_enum_accent/00-base.xml index e484230..561d778 100644 --- a/tests/flattener_dicos/10valid_enum_accent/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_accent/00-base.xml @@ -20,7 +20,6 @@ ['a', 'b', 'c', 'é'] - False diff --git a/tests/flattener_dicos/10valid_enum_accent/makedict/base.json b/tests/flattener_dicos/10valid_enum_accent/makedict/base.json index 132193c..7d6534c 100644 --- a/tests/flattener_dicos/10valid_enum_accent/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_accent/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": "a"} \ No newline at end of file +{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": "c"} diff --git a/tests/flattener_dicos/10valid_enum_accent/result/00-base.xml b/tests/flattener_dicos/10valid_enum_accent/result/00-base.xml index 122b659..4b77bc7 100644 --- a/tests/flattener_dicos/10valid_enum_accent/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_accent/result/00-base.xml @@ -1,10 +1,5 @@ - - - ['a', 'b', 'c', 'é'] - - expert @@ -18,10 +13,14 @@ expert - + + a + b + c + é mandatory expert - a + c diff --git a/tests/flattener_dicos/10valid_enum_base/result/00-base.xml b/tests/flattener_dicos/10valid_enum_base/result/00-base.xml index 5d95d2a..b05183b 100644 --- a/tests/flattener_dicos/10valid_enum_base/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_base/result/00-base.xml @@ -1,6 +1,5 @@ - expert diff --git a/tests/flattener_dicos/10valid_enum_base_redefine/result/00-base.xml b/tests/flattener_dicos/10valid_enum_base_redefine/result/00-base.xml index da6c6cf..5fcbc12 100644 --- a/tests/flattener_dicos/10valid_enum_base_redefine/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_base_redefine/result/00-base.xml @@ -1,6 +1,5 @@ - expert diff --git a/tests/flattener_dicos/10valid_enum_checkval_true/result/00-base.xml b/tests/flattener_dicos/10valid_enum_checkval_true/result/00-base.xml index 76f4401..99b9358 100644 --- a/tests/flattener_dicos/10valid_enum_checkval_true/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_checkval_true/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10valid_enum_eosfunc/result/00-base.xml b/tests/flattener_dicos/10valid_enum_eosfunc/result/00-base.xml index 082ac0f..0f6337d 100644 --- a/tests/flattener_dicos/10valid_enum_eosfunc/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_eosfunc/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10valid_enum_mandatory/result/00-base.xml b/tests/flattener_dicos/10valid_enum_mandatory/result/00-base.xml index bfeb956..4f5cfcb 100644 --- a/tests/flattener_dicos/10valid_enum_mandatory/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_mandatory/result/00-base.xml @@ -1,6 +1,5 @@ - expert diff --git a/tests/flattener_dicos/10valid_enum_master/result/00-base.xml b/tests/flattener_dicos/10valid_enum_master/result/00-base.xml index e1499d5..a4de8b1 100644 --- a/tests/flattener_dicos/10valid_enum_master/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_master/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10valid_enum_multi/result/00-base.xml b/tests/flattener_dicos/10valid_enum_multi/result/00-base.xml index a938e5a..73bdc7e 100644 --- a/tests/flattener_dicos/10valid_enum_multi/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_multi/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/10valid_enum_number/result/00-base.xml b/tests/flattener_dicos/10valid_enum_number/result/00-base.xml index 2e6e895..9f0a98b 100644 --- a/tests/flattener_dicos/10valid_enum_number/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_number/result/00-base.xml @@ -1,6 +1,5 @@ - expert diff --git a/tests/flattener_dicos/10valid_enum_numberdefault/result/00-base.xml b/tests/flattener_dicos/10valid_enum_numberdefault/result/00-base.xml index 708e9fa..f279461 100644 --- a/tests/flattener_dicos/10valid_enum_numberdefault/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_numberdefault/result/00-base.xml @@ -1,6 +1,5 @@ - expert diff --git a/tests/flattener_dicos/10valid_enum_python/result/00-base.xml b/tests/flattener_dicos/10valid_enum_python/result/00-base.xml index db3c565..9267642 100644 --- a/tests/flattener_dicos/10valid_enum_python/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_python/result/00-base.xml @@ -1,6 +1,5 @@ - expert diff --git a/tests/flattener_dicos/10valid_enum_value/00-base.xml b/tests/flattener_dicos/10valid_enum_value/00-base.xml index 62a372a..f3b0940 100644 --- a/tests/flattener_dicos/10valid_enum_value/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_value/00-base.xml @@ -15,7 +15,6 @@ ['a','b','c'] - False diff --git a/tests/flattener_dicos/10valid_enum_value/makedict/base.json b/tests/flattener_dicos/10valid_enum_value/makedict/base.json index ff9061a..1708d5f 100644 --- a/tests/flattener_dicos/10valid_enum_value/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_value/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "a"} \ No newline at end of file +{"creole.general.mode_conteneur_actif": "b"} diff --git a/tests/flattener_dicos/10valid_enum_value/result/00-base.xml b/tests/flattener_dicos/10valid_enum_value/result/00-base.xml index 27478a0..5850046 100644 --- a/tests/flattener_dicos/10valid_enum_value/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_value/result/00-base.xml @@ -1,17 +1,15 @@ - - - ['a','b','c'] - - normal - + + a + b + c mandatory normal - a + b diff --git a/tests/flattener_dicos/11disabled_if_in_filelist/result/00-base.xml b/tests/flattener_dicos/11disabled_if_in_filelist/result/00-base.xml index aece8c8..131a207 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist/result/00-base.xml +++ b/tests/flattener_dicos/11disabled_if_in_filelist/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_multi/result/00-base.xml b/tests/flattener_dicos/11disabled_if_in_filelist_multi/result/00-base.xml index ed3d463..9947243 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist_multi/result/00-base.xml +++ b/tests/flattener_dicos/11disabled_if_in_filelist_multi/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml b/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml index 3d80c0c..fd84f7b 100644 --- a/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml +++ b/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml index 3d80c0c..fd84f7b 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/result/00-base.xml b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/result/00-base.xml index 3d80c0c..fd84f7b 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/result/00-base.xml +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/result/00-base.xml b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/result/00-base.xml index b880296..9e0b269 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/result/00-base.xml +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/11multi_disabled_if_in_filelist/result/00-base.xml b/tests/flattener_dicos/11multi_disabled_if_in_filelist/result/00-base.xml index 3277422..9620f7f 100644 --- a/tests/flattener_dicos/11multi_disabled_if_in_filelist/result/00-base.xml +++ b/tests/flattener_dicos/11multi_disabled_if_in_filelist/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/20family_append/result/00-base.xml b/tests/flattener_dicos/20family_append/result/00-base.xml index 60569de..5dcfd17 100644 --- a/tests/flattener_dicos/20family_append/result/00-base.xml +++ b/tests/flattener_dicos/20family_append/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/20family_appendaccent/result/00-base.xml b/tests/flattener_dicos/20family_appendaccent/result/00-base.xml index f395d36..2f1ac4f 100644 --- a/tests/flattener_dicos/20family_appendaccent/result/00-base.xml +++ b/tests/flattener_dicos/20family_appendaccent/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/20family_empty/result/00-base.xml b/tests/flattener_dicos/20family_empty/result/00-base.xml index a76e6df..b3d1e9c 100644 --- a/tests/flattener_dicos/20family_empty/result/00-base.xml +++ b/tests/flattener_dicos/20family_empty/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/20family_hidden/result/00-base.xml b/tests/flattener_dicos/20family_hidden/result/00-base.xml index bb8abf6..b33a52e 100644 --- a/tests/flattener_dicos/20family_hidden/result/00-base.xml +++ b/tests/flattener_dicos/20family_hidden/result/00-base.xml @@ -1,6 +1,5 @@ - hidden diff --git a/tests/flattener_dicos/20family_mode/result/00-base.xml b/tests/flattener_dicos/20family_mode/result/00-base.xml index a76e6df..b3d1e9c 100644 --- a/tests/flattener_dicos/20family_mode/result/00-base.xml +++ b/tests/flattener_dicos/20family_mode/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/20family_modemasterslaves/result/00-base.xml b/tests/flattener_dicos/20family_modemasterslaves/result/00-base.xml index f06fa35..f584c5a 100644 --- a/tests/flattener_dicos/20family_modemasterslaves/result/00-base.xml +++ b/tests/flattener_dicos/20family_modemasterslaves/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/21family_change/result/00-base.xml b/tests/flattener_dicos/21family_change/result/00-base.xml index 40bda6f..6d367af 100644 --- a/tests/flattener_dicos/21family_change/result/00-base.xml +++ b/tests/flattener_dicos/21family_change/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/21family_changeaccent/result/00-base.xml b/tests/flattener_dicos/21family_changeaccent/result/00-base.xml index 1940f79..c90bbce 100644 --- a/tests/flattener_dicos/21family_changeaccent/result/00-base.xml +++ b/tests/flattener_dicos/21family_changeaccent/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/21family_empty/result/00-base.xml b/tests/flattener_dicos/21family_empty/result/00-base.xml index 082ac0f..0f6337d 100644 --- a/tests/flattener_dicos/21family_empty/result/00-base.xml +++ b/tests/flattener_dicos/21family_empty/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/30mandatory_withoutvalue/result/00-base.xml b/tests/flattener_dicos/30mandatory_withoutvalue/result/00-base.xml index c8edbfa..9f31158 100644 --- a/tests/flattener_dicos/30mandatory_withoutvalue/result/00-base.xml +++ b/tests/flattener_dicos/30mandatory_withoutvalue/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml b/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml index 4d9c0d8..49daa39 100644 --- a/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml +++ b/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/30mandatory_withvalue/result/00-base.xml b/tests/flattener_dicos/30mandatory_withvalue/result/00-base.xml index 3ceac7f..22e1fc7 100644 --- a/tests/flattener_dicos/30mandatory_withvalue/result/00-base.xml +++ b/tests/flattener_dicos/30mandatory_withvalue/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml b/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml index 05b9531..cb7e140 100644 --- a/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml +++ b/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/40condition_base/result/00-base.xml b/tests/flattener_dicos/40condition_base/result/00-base.xml index bf709a4..d74bc8d 100644 --- a/tests/flattener_dicos/40condition_base/result/00-base.xml +++ b/tests/flattener_dicos/40condition_base/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/40condition_fallback/result/00-base.xml b/tests/flattener_dicos/40condition_fallback/result/00-base.xml index 4e5e8ec..26e99f0 100644 --- a/tests/flattener_dicos/40condition_fallback/result/00-base.xml +++ b/tests/flattener_dicos/40condition_fallback/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/40condition_optional/result/00-base.xml b/tests/flattener_dicos/40condition_optional/result/00-base.xml index 4467392..e9ed742 100644 --- a/tests/flattener_dicos/40condition_optional/result/00-base.xml +++ b/tests/flattener_dicos/40condition_optional/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/40ifin_masterslaves/result/00-base.xml b/tests/flattener_dicos/40ifin_masterslaves/result/00-base.xml index 7ee5529..ccee203 100644 --- a/tests/flattener_dicos/40ifin_masterslaves/result/00-base.xml +++ b/tests/flattener_dicos/40ifin_masterslaves/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml b/tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml index 70af7e5..49c2048 100644 --- a/tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml +++ b/tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/40ifin_multi/result/00-base.xml b/tests/flattener_dicos/40ifin_multi/result/00-base.xml index 96cca98..d96c836 100644 --- a/tests/flattener_dicos/40ifin_multi/result/00-base.xml +++ b/tests/flattener_dicos/40ifin_multi/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/40ifin_validenum/result/00-base.xml b/tests/flattener_dicos/40ifin_validenum/result/00-base.xml index cf55b9f..53126b7 100644 --- a/tests/flattener_dicos/40ifin_validenum/result/00-base.xml +++ b/tests/flattener_dicos/40ifin_validenum/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/50exists_exists/result/00-base.xml b/tests/flattener_dicos/50exists_exists/result/00-base.xml index 5047d38..921cd4e 100644 --- a/tests/flattener_dicos/50exists_exists/result/00-base.xml +++ b/tests/flattener_dicos/50exists_exists/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/50redefine_description/result/00-base.xml b/tests/flattener_dicos/50redefine_description/result/00-base.xml index 420121e..850fedf 100644 --- a/tests/flattener_dicos/50redefine_description/result/00-base.xml +++ b/tests/flattener_dicos/50redefine_description/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/51exists_nonexists/result/00-base.xml b/tests/flattener_dicos/51exists_nonexists/result/00-base.xml index f637643..42a2136 100644 --- a/tests/flattener_dicos/51exists_nonexists/result/00-base.xml +++ b/tests/flattener_dicos/51exists_nonexists/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/51redefine_auto/result/00-base.xml b/tests/flattener_dicos/51redefine_auto/result/00-base.xml index 5a80ad8..24ce203 100644 --- a/tests/flattener_dicos/51redefine_auto/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_auto/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/51redefine_autofill/result/00-base.xml b/tests/flattener_dicos/51redefine_autofill/result/00-base.xml index 5b90cbe..67ee6f6 100644 --- a/tests/flattener_dicos/51redefine_autofill/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_autofill/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/51redefine_family/result/00-base.xml b/tests/flattener_dicos/51redefine_family/result/00-base.xml index 7e3af69..3d13dd4 100644 --- a/tests/flattener_dicos/51redefine_family/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_family/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/51redefine_fill/result/00-base.xml b/tests/flattener_dicos/51redefine_fill/result/00-base.xml index 5a80ad8..24ce203 100644 --- a/tests/flattener_dicos/51redefine_fill/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_fill/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml b/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml index 5a80ad8..24ce203 100644 --- a/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/51redefine_help/result/00-base.xml b/tests/flattener_dicos/51redefine_help/result/00-base.xml index 4cac238..de41761 100644 --- a/tests/flattener_dicos/51redefine_help/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_help/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/51redefine_hidden/result/00-base.xml b/tests/flattener_dicos/51redefine_hidden/result/00-base.xml index 7c4ffab..48c5d1c 100644 --- a/tests/flattener_dicos/51redefine_hidden/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_hidden/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/51redefine_remove_check/result/00-base.xml b/tests/flattener_dicos/51redefine_remove_check/result/00-base.xml index 1eb01f2..8d8e2b2 100644 --- a/tests/flattener_dicos/51redefine_remove_check/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_remove_check/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/51redefine_remove_condition/result/00-base.xml b/tests/flattener_dicos/51redefine_remove_condition/result/00-base.xml index 868465c..9d92354 100644 --- a/tests/flattener_dicos/51redefine_remove_condition/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_remove_condition/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/51redefine_removecondition_alltarget/result/00-base.xml b/tests/flattener_dicos/51redefine_removecondition_alltarget/result/00-base.xml index 92f93ab..300f2b3 100644 --- a/tests/flattener_dicos/51redefine_removecondition_alltarget/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_removecondition_alltarget/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/result/00-base.xml b/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/result/00-base.xml index d15819e..c5f463e 100644 --- a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/51redefine_validenum/result/00-base.xml b/tests/flattener_dicos/51redefine_validenum/result/00-base.xml index 520fd68..80505c7 100644 --- a/tests/flattener_dicos/51redefine_validenum/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_validenum/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/51redefine_value/result/00-base.xml b/tests/flattener_dicos/51redefine_value/result/00-base.xml index 62a2690..c906a40 100644 --- a/tests/flattener_dicos/51redefine_value/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_value/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/52exists_redefine/result/00-base.xml b/tests/flattener_dicos/52exists_redefine/result/00-base.xml index 96b0e75..9e3b5db 100644 --- a/tests/flattener_dicos/52exists_redefine/result/00-base.xml +++ b/tests/flattener_dicos/52exists_redefine/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/60action_external/result/00-base.xml b/tests/flattener_dicos/60action_external/result/00-base.xml index ce90679..3159d66 100644 --- a/tests/flattener_dicos/60action_external/result/00-base.xml +++ b/tests/flattener_dicos/60action_external/result/00-base.xml @@ -57,7 +57,6 @@ - normal diff --git a/tests/flattener_dicos/60extra_externalspacecondition/result/00-base.xml b/tests/flattener_dicos/60extra_externalspacecondition/result/00-base.xml index 4b2d124..1c79523 100644 --- a/tests/flattener_dicos/60extra_externalspacecondition/result/00-base.xml +++ b/tests/flattener_dicos/60extra_externalspacecondition/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/60extra_help/result/00-base.xml b/tests/flattener_dicos/60extra_help/result/00-base.xml index 5d3f3cf..3fb23e9 100644 --- a/tests/flattener_dicos/60extra_help/result/00-base.xml +++ b/tests/flattener_dicos/60extra_help/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/60extra_load/result/00-base.xml b/tests/flattener_dicos/60extra_load/result/00-base.xml index 109949f..b5eb1cf 100644 --- a/tests/flattener_dicos/60extra_load/result/00-base.xml +++ b/tests/flattener_dicos/60extra_load/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/60extra_mandatory/result/00-base.xml b/tests/flattener_dicos/60extra_mandatory/result/00-base.xml index 876b838..a5b227c 100644 --- a/tests/flattener_dicos/60extra_mandatory/result/00-base.xml +++ b/tests/flattener_dicos/60extra_mandatory/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/60extra_redefine/result/00-base.xml b/tests/flattener_dicos/60extra_redefine/result/00-base.xml index cdc4d3c..1483a00 100644 --- a/tests/flattener_dicos/60extra_redefine/result/00-base.xml +++ b/tests/flattener_dicos/60extra_redefine/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/60familyaction/result/00-base.xml b/tests/flattener_dicos/60familyaction/result/00-base.xml index a96b952..71988ee 100644 --- a/tests/flattener_dicos/60familyaction/result/00-base.xml +++ b/tests/flattener_dicos/60familyaction/result/00-base.xml @@ -56,7 +56,6 @@ - normal diff --git a/tests/flattener_dicos/60familyaction_accent/result/00-base.xml b/tests/flattener_dicos/60familyaction_accent/result/00-base.xml index 8db0990..344fc52 100644 --- a/tests/flattener_dicos/60familyaction_accent/result/00-base.xml +++ b/tests/flattener_dicos/60familyaction_accent/result/00-base.xml @@ -56,7 +56,6 @@ - normal diff --git a/tests/flattener_dicos/60familyaction_disable/result/00-base.xml b/tests/flattener_dicos/60familyaction_disable/result/00-base.xml index c2e5263..4a7a2e6 100644 --- a/tests/flattener_dicos/60familyaction_disable/result/00-base.xml +++ b/tests/flattener_dicos/60familyaction_disable/result/00-base.xml @@ -57,7 +57,6 @@ - normal diff --git a/tests/flattener_dicos/60familyaction_empty/result/00-base.xml b/tests/flattener_dicos/60familyaction_empty/result/00-base.xml index 27db63d..3b3c397 100644 --- a/tests/flattener_dicos/60familyaction_empty/result/00-base.xml +++ b/tests/flattener_dicos/60familyaction_empty/result/00-base.xml @@ -59,7 +59,6 @@ - normal diff --git a/tests/flattener_dicos/60familyaction_mandatory/result/00-base.xml b/tests/flattener_dicos/60familyaction_mandatory/result/00-base.xml index ab19be5..9e67b16 100644 --- a/tests/flattener_dicos/60familyaction_mandatory/result/00-base.xml +++ b/tests/flattener_dicos/60familyaction_mandatory/result/00-base.xml @@ -56,7 +56,6 @@ - normal diff --git a/tests/flattener_dicos/60familyaction_save/result/00-base.xml b/tests/flattener_dicos/60familyaction_save/result/00-base.xml index 8885616..cce6da0 100644 --- a/tests/flattener_dicos/60familyaction_save/result/00-base.xml +++ b/tests/flattener_dicos/60familyaction_save/result/00-base.xml @@ -56,7 +56,6 @@ - normal diff --git a/tests/flattener_dicos/60familyaction_twoactions/result/00-base.xml b/tests/flattener_dicos/60familyaction_twoactions/result/00-base.xml index dd725d5..bd8f188 100644 --- a/tests/flattener_dicos/60familyaction_twoactions/result/00-base.xml +++ b/tests/flattener_dicos/60familyaction_twoactions/result/00-base.xml @@ -96,7 +96,6 @@ - normal diff --git a/tests/flattener_dicos/60familyactionexternal/result/00-base.xml b/tests/flattener_dicos/60familyactionexternal/result/00-base.xml index dbd5d77..79d51e6 100644 --- a/tests/flattener_dicos/60familyactionexternal/result/00-base.xml +++ b/tests/flattener_dicos/60familyactionexternal/result/00-base.xml @@ -59,7 +59,6 @@ - normal diff --git a/tests/flattener_dicos/70container_all/result/00-base.xml b/tests/flattener_dicos/70container_all/result/00-base.xml index 6a89072..b8c2220 100644 --- a/tests/flattener_dicos/70container_all/result/00-base.xml +++ b/tests/flattener_dicos/70container_all/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_allfile/result/00-base.xml b/tests/flattener_dicos/70container_allfile/result/00-base.xml index a143559..8f36e84 100644 --- a/tests/flattener_dicos/70container_allfile/result/00-base.xml +++ b/tests/flattener_dicos/70container_allfile/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_allnotexists/result/00-base.xml b/tests/flattener_dicos/70container_allnotexists/result/00-base.xml index c71256b..2a509a8 100644 --- a/tests/flattener_dicos/70container_allnotexists/result/00-base.xml +++ b/tests/flattener_dicos/70container_allnotexists/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_disknod/result/00-base.xml b/tests/flattener_dicos/70container_disknod/result/00-base.xml index bd79223..f8fed41 100644 --- a/tests/flattener_dicos/70container_disknod/result/00-base.xml +++ b/tests/flattener_dicos/70container_disknod/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_files/result/00-base.xml b/tests/flattener_dicos/70container_files/result/00-base.xml index 0a62819..cf39568 100644 --- a/tests/flattener_dicos/70container_files/result/00-base.xml +++ b/tests/flattener_dicos/70container_files/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_filesmulti/result/00-base.xml b/tests/flattener_dicos/70container_filesmulti/result/00-base.xml index 287dd43..0ab3def 100644 --- a/tests/flattener_dicos/70container_filesmulti/result/00-base.xml +++ b/tests/flattener_dicos/70container_filesmulti/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_filesredefine/result/00-base.xml b/tests/flattener_dicos/70container_filesredefine/result/00-base.xml index 646422d..214f2fb 100644 --- a/tests/flattener_dicos/70container_filesredefine/result/00-base.xml +++ b/tests/flattener_dicos/70container_filesredefine/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_filesrm/result/00-base.xml b/tests/flattener_dicos/70container_filesrm/result/00-base.xml index c8059d0..50fcba8 100644 --- a/tests/flattener_dicos/70container_filesrm/result/00-base.xml +++ b/tests/flattener_dicos/70container_filesrm/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_fstab/result/00-base.xml b/tests/flattener_dicos/70container_fstab/result/00-base.xml index e00e161..b521d73 100644 --- a/tests/flattener_dicos/70container_fstab/result/00-base.xml +++ b/tests/flattener_dicos/70container_fstab/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_fstabsymlink/result/00-base.xml b/tests/flattener_dicos/70container_fstabsymlink/result/00-base.xml index d15ebe8..da51b4f 100644 --- a/tests/flattener_dicos/70container_fstabsymlink/result/00-base.xml +++ b/tests/flattener_dicos/70container_fstabsymlink/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_host/result/00-base.xml b/tests/flattener_dicos/70container_host/result/00-base.xml index 8d4a229..d32f8c9 100644 --- a/tests/flattener_dicos/70container_host/result/00-base.xml +++ b/tests/flattener_dicos/70container_host/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_interface/result/00-base.xml b/tests/flattener_dicos/70container_interface/result/00-base.xml index 7ba28ff..a2f851f 100644 --- a/tests/flattener_dicos/70container_interface/result/00-base.xml +++ b/tests/flattener_dicos/70container_interface/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_new/result/00-base.xml b/tests/flattener_dicos/70container_new/result/00-base.xml index f6c345b..cf79bca 100644 --- a/tests/flattener_dicos/70container_new/result/00-base.xml +++ b/tests/flattener_dicos/70container_new/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/70container_newnocont/result/00-base.xml b/tests/flattener_dicos/70container_newnocont/result/00-base.xml index 0e8013a..046e693 100644 --- a/tests/flattener_dicos/70container_newnocont/result/00-base.xml +++ b/tests/flattener_dicos/70container_newnocont/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/70container_newwithip/result/00-base.xml b/tests/flattener_dicos/70container_newwithip/result/00-base.xml index d4094f1..f7f229c 100644 --- a/tests/flattener_dicos/70container_newwithip/result/00-base.xml +++ b/tests/flattener_dicos/70container_newwithip/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/70container_nocontainer/result/00-base.xml b/tests/flattener_dicos/70container_nocontainer/result/00-base.xml index a83903f..186c04d 100644 --- a/tests/flattener_dicos/70container_nocontainer/result/00-base.xml +++ b/tests/flattener_dicos/70container_nocontainer/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_package/result/00-base.xml b/tests/flattener_dicos/70container_package/result/00-base.xml index 391e262..7daaa81 100644 --- a/tests/flattener_dicos/70container_package/result/00-base.xml +++ b/tests/flattener_dicos/70container_package/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_pathaccess/result/00-base.xml b/tests/flattener_dicos/70container_pathaccess/result/00-base.xml index 13b48df..3323b62 100644 --- a/tests/flattener_dicos/70container_pathaccess/result/00-base.xml +++ b/tests/flattener_dicos/70container_pathaccess/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_pathaccess_masterslaves/result/00-base.xml b/tests/flattener_dicos/70container_pathaccess_masterslaves/result/00-base.xml index c3502a5..3cd8c0d 100644 --- a/tests/flattener_dicos/70container_pathaccess_masterslaves/result/00-base.xml +++ b/tests/flattener_dicos/70container_pathaccess_masterslaves/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_save/result/00-base.xml b/tests/flattener_dicos/70container_save/result/00-base.xml index b6669f8..c4ab1fb 100644 --- a/tests/flattener_dicos/70container_save/result/00-base.xml +++ b/tests/flattener_dicos/70container_save/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos/70container_serviceaccess/result/00-base.xml b/tests/flattener_dicos/70container_serviceaccess/result/00-base.xml index 5daacfa..88bd3b9 100644 --- a/tests/flattener_dicos/70container_serviceaccess/result/00-base.xml +++ b/tests/flattener_dicos/70container_serviceaccess/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_serviceaccess_disabledifin/result/00-base.xml b/tests/flattener_dicos/70container_serviceaccess_disabledifin/result/00-base.xml index 9703cf0..d81813a 100644 --- a/tests/flattener_dicos/70container_serviceaccess_disabledifin/result/00-base.xml +++ b/tests/flattener_dicos/70container_serviceaccess_disabledifin/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_serviceaccesslist/result/00-base.xml b/tests/flattener_dicos/70container_serviceaccesslist/result/00-base.xml index 95e88b6..c05f34a 100644 --- a/tests/flattener_dicos/70container_serviceaccesslist/result/00-base.xml +++ b/tests/flattener_dicos/70container_serviceaccesslist/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_serviceaccesslist_servicelist/result/00-base.xml b/tests/flattener_dicos/70container_serviceaccesslist_servicelist/result/00-base.xml index 617f615..8cd5f4b 100644 --- a/tests/flattener_dicos/70container_serviceaccesslist_servicelist/result/00-base.xml +++ b/tests/flattener_dicos/70container_serviceaccesslist_servicelist/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_servicerestriction/result/00-base.xml b/tests/flattener_dicos/70container_servicerestriction/result/00-base.xml index 0755d51..526f252 100644 --- a/tests/flattener_dicos/70container_servicerestriction/result/00-base.xml +++ b/tests/flattener_dicos/70container_servicerestriction/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_services/result/00-base.xml b/tests/flattener_dicos/70container_services/result/00-base.xml index 8c43279..f1e7daf 100644 --- a/tests/flattener_dicos/70container_services/result/00-base.xml +++ b/tests/flattener_dicos/70container_services/result/00-base.xml @@ -1,6 +1,5 @@ - diff --git a/tests/flattener_dicos/70container_subgroup/result/00-base.xml b/tests/flattener_dicos/70container_subgroup/result/00-base.xml index e878c7f..aaf870b 100644 --- a/tests/flattener_dicos/70container_subgroup/result/00-base.xml +++ b/tests/flattener_dicos/70container_subgroup/result/00-base.xml @@ -1,6 +1,5 @@ - basic diff --git a/tests/flattener_dicos/01fill_context/00-base.xml b/tests/flattener_dicos_hum/01fill_context/00-base.xml similarity index 100% rename from tests/flattener_dicos/01fill_context/00-base.xml rename to tests/flattener_dicos_hum/01fill_context/00-base.xml diff --git a/tests/flattener_dicos/01fill_context/makedict/base.json b/tests/flattener_dicos_hum/01fill_context/makedict/base.json similarity index 100% rename from tests/flattener_dicos/01fill_context/makedict/base.json rename to tests/flattener_dicos_hum/01fill_context/makedict/base.json diff --git a/tests/flattener_dicos/01fill_context/result/00-base.xml b/tests/flattener_dicos_hum/01fill_context/result/00-base.xml similarity index 98% rename from tests/flattener_dicos/01fill_context/result/00-base.xml rename to tests/flattener_dicos_hum/01fill_context/result/00-base.xml index ca5b9d3..7df9992 100644 --- a/tests/flattener_dicos/01fill_context/result/00-base.xml +++ b/tests/flattener_dicos_hum/01fill_context/result/00-base.xml @@ -1,6 +1,5 @@ - normal diff --git a/tests/flattener_dicos_hum/10valid_enum_accent_checkval/00-base.xml b/tests/flattener_dicos_hum/10valid_enum_accent_checkval/00-base.xml new file mode 100644 index 0000000..e484230 --- /dev/null +++ b/tests/flattener_dicos_hum/10valid_enum_accent_checkval/00-base.xml @@ -0,0 +1,33 @@ + + + + + + + + + non + + + + + c + + + + + + + + ['a', 'b', 'c', 'é'] + False + + + + + bla bla bla + + + + diff --git a/tests/flattener_dicos_hum/10valid_enum_accent_checkval/makedict/base.json b/tests/flattener_dicos_hum/10valid_enum_accent_checkval/makedict/base.json new file mode 100644 index 0000000..132193c --- /dev/null +++ b/tests/flattener_dicos_hum/10valid_enum_accent_checkval/makedict/base.json @@ -0,0 +1 @@ +{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": "a"} \ No newline at end of file diff --git a/tests/flattener_dicos_hum/10valid_enum_accent_checkval/result/00-base.xml b/tests/flattener_dicos_hum/10valid_enum_accent_checkval/result/00-base.xml new file mode 100644 index 0000000..122b659 --- /dev/null +++ b/tests/flattener_dicos_hum/10valid_enum_accent_checkval/result/00-base.xml @@ -0,0 +1,29 @@ + + + + + ['a', 'b', 'c', 'é'] + + + + + expert + + oui + non + mandatory + expert + non + + + + expert + + mandatory + expert + a + + + + + diff --git a/tests/flattener_dicos/10valid_enum_checkval/00-base.xml b/tests/flattener_dicos_hum/10valid_enum_checkval/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_checkval/00-base.xml rename to tests/flattener_dicos_hum/10valid_enum_checkval/00-base.xml diff --git a/tests/flattener_dicos/10valid_enum_checkval/makedict/base.json b/tests/flattener_dicos_hum/10valid_enum_checkval/makedict/base.json similarity index 100% rename from tests/flattener_dicos/10valid_enum_checkval/makedict/base.json rename to tests/flattener_dicos_hum/10valid_enum_checkval/makedict/base.json diff --git a/tests/flattener_dicos/10valid_enum_checkval/result/00-base.xml b/tests/flattener_dicos_hum/10valid_enum_checkval/result/00-base.xml similarity index 100% rename from tests/flattener_dicos/10valid_enum_checkval/result/00-base.xml rename to tests/flattener_dicos_hum/10valid_enum_checkval/result/00-base.xml diff --git a/tests/flattener_dicos_hum/10valid_enum_value_checkval/00-base.xml b/tests/flattener_dicos_hum/10valid_enum_value_checkval/00-base.xml new file mode 100644 index 0000000..62a372a --- /dev/null +++ b/tests/flattener_dicos_hum/10valid_enum_value_checkval/00-base.xml @@ -0,0 +1,26 @@ + + + + + + + + + b + + + + + + + + ['a','b','c'] + False + + + + + + + diff --git a/tests/flattener_dicos_hum/10valid_enum_value_checkval/makedict/base.json b/tests/flattener_dicos_hum/10valid_enum_value_checkval/makedict/base.json new file mode 100644 index 0000000..ff9061a --- /dev/null +++ b/tests/flattener_dicos_hum/10valid_enum_value_checkval/makedict/base.json @@ -0,0 +1 @@ +{"creole.general.mode_conteneur_actif": "a"} \ No newline at end of file diff --git a/tests/flattener_dicos_hum/10valid_enum_value_checkval/result/00-base.xml b/tests/flattener_dicos_hum/10valid_enum_value_checkval/result/00-base.xml new file mode 100644 index 0000000..27478a0 --- /dev/null +++ b/tests/flattener_dicos_hum/10valid_enum_value_checkval/result/00-base.xml @@ -0,0 +1,19 @@ + + + + + ['a','b','c'] + + + + + normal + + mandatory + normal + a + + + + + diff --git a/tests/test_flattener.py b/tests/test_flattener.py index 68fb8ab..6e4559e 100644 --- a/tests/test_flattener.py +++ b/tests/test_flattener.py @@ -30,7 +30,7 @@ for test in listdir(dico_dirs): excludes = set([]) test_ok -= excludes test_raise -= excludes -# test_ok = ['10autosave_hidden'] +# test_ok = ['10check_base'] # test_raise = []