test error number

tests/dictionaries/10autosave_hidden_frozenifin/makedict/base.json

@@ -1 +0,0 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.autosavevar": "oui"}

tests/dictionaries/10autosave_hidden_frozenifin/tiramisu/base.py

@@ -1,15 +0,0 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-from rougail.tiramisu import ConvertDynOptionDescription
-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', 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])
-option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
-option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/80auto_autofreeze/00-base.xml

@@ -2,7 +2,10 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True">
+            <variable name="module_instancie" type="oui/non" description="No change">
+                <value>non</value>
+            </variable>
+            <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True" hidden="True">
                 <value>non</value>
             </variable>
         </family>
@@ -10,7 +13,7 @@
     </variables>
     <constraints>
         <fill name="calc_val" target="mode_conteneur_actif">
-            <param>value</param>
+            <param>oui</param>
         </fill>
     </constraints>
 </rougail>

tests/dictionaries/80extra_auto_freeze/00-base.xml

@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail>
+    <variables>
+        <family name="général">
+            <variable name="module_instancie" type="oui/non" description="No change">
+                <value>non</value>
+            </variable>
+            <variable name="activer_ejabberd" type="oui/non" description="No change" hidden="True">
+                <value>non</value>
+            </variable>
+        </family>
+    </variables>
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->

tests/dictionaries/80extra_auto_freeze/extra_dirs/extra/00-base.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<rougail>
+    <variables>
+        <family name='ejabberd'>
+            <variable name="mode" type="string" auto_freeze="True">
+                <value>pre</value>
+            </variable>
+        </family>
+    </variables>
+</rougail>

tests/dictionaries/80leadership_autofreeze/00-base.xml

@@ -2,9 +2,10 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="leader" type="string" description="leader" auto_freeze="True"/>
-            <variable name="follower1" type="string" description="follower1"/>
-            <variable name="follower2" type="string" description="follower2"/>
+            <variable name="module_instancie" type="oui/non" description="No change"/>
+            <variable name="leader" type="string" description="leader" auto_freeze="True" multi="True"/>
+            <variable name="follower1" type="string" description="follower1" multi="True"/>
+            <variable name="follower2" type="string" description="follower2" multi="True"/>
         </family>
     </variables>
 

tests/test_1_flattener.py

@@ -71,13 +71,14 @@ def launch_flattener(test_dir, test_ok=False):
     eolobj.space_visitor(eosfunc)
     tiramisu_objects = eolobj.save()
     tiramisu_dir = join(test_dir, 'tiramisu')
-    tiramisu_file = join(tiramisu_dir, 'base.py')
-    if not isfile(tiramisu_file) or debug:
-        with open(tiramisu_file, 'w') as fh:
-            fh.write(tiramisu_objects)
-    with open(tiramisu_file, 'r') as fh:
-        tiramisu_objects_ori = fh.read()
-    assert tiramisu_objects == tiramisu_objects_ori
+    if isdir(tiramisu_dir):
+        tiramisu_file = join(tiramisu_dir, 'base.py')
+        if not isfile(tiramisu_file) or debug:
+            with open(tiramisu_file, 'w') as fh:
+                fh.write(tiramisu_objects)
+        with open(tiramisu_file, 'r') as fh:
+            tiramisu_objects_ori = fh.read()
+        assert tiramisu_objects == tiramisu_objects_ori
 
 
 def fake_traduc(txt):
@@ -106,8 +107,15 @@ def test_dictionary(test_dir):
 def test_error_dictionary(test_dir_error):
     assert getcwd() == ORI_DIR
     test_dir = join(dico_dirs, test_dir_error)
-    with raises(DictConsistencyError):
+    errno = 0
+    for i in listdir(test_dir):
+        if i.startswith('errno_'):
+            if errno:
+                raise Exception('multiple errno')
+            errno = int(i.split('_')[1])
+    with raises(DictConsistencyError) as err:
         launch_flattener(test_dir)
+    assert err.value.errno == errno, f'expected errno: {errno}, errno: {err.value.errno}, value: {err.value}'
     assert getcwd() == ORI_DIR