merge flattener_dico and templates in tests

tests/dictionaries/70container_files/00-base.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<rougail>
+
+    <services> 
+        <service name='test'>
+            <file name='/etc/mailname'/>
+            <file name='/rougail.conf'/>
+        </service>
+    </services>
+
+
+    <variables>
+        <family name='général'>
+            <variable name='mode_conteneur_actif' type='oui/non' description="No change" hidden="True">
+                <value>oui</value>
+            </variable>
+        </family>
+        <separators/>
+    </variables>
+
+    <constraints>
+    </constraints>
+
+    <help/>
+
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->

tests/dictionaries/70container_files/makedict/base.json

@@ -0,0 +1 @@
+{"rougail.general.mode_conteneur_actif": "oui", "services.test.files.mailname.group": "root", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.templating": true, "services.test.files.mailname.activate": true, "services.test.files.rougail_conf.group": "root", "services.test.files.rougail_conf.mode": "0644", "services.test.files.rougail_conf.name": "/rougail.conf", "services.test.files.rougail_conf.owner": "root", "services.test.files.rougail_conf.source": "rougail.conf", "services.test.files.rougail_conf.templating": true, "services.test.files.rougail_conf.activate": true}

tests/dictionaries/70container_files/result/etc/mailname

@@ -0,0 +1 @@
+oui

tests/dictionaries/70container_files/result/rougail.conf

@@ -0,0 +1,2 @@
+C /etc/mailname 0644 root root - /usr/local/share/factory/etc/mailname
+z /etc/mailname - - - - -

tests/dictionaries/70container_files/tiramisu/base.py

@@ -0,0 +1,28 @@
+from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+import imp
+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])
+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(name='templating', doc='templating', multi=False, default=True)
+option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True)
+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(name='templating', doc='templating', multi=False, default=True)
+option_22 = BoolOption(name='activate', doc='activate', multi=False, default=True)
+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_5.impl_set_information("manage", True)
+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])

tests/dictionaries/70container_files/tmpl/mailname

@@ -0,0 +1,6 @@
+%if %%is_defined('mode_conteneur_actif')
+%%mode_conteneur_actif
+%end if
+%if %%is_defined('mode_conteneur_actif3')
+%%mode_conteneur_actif3
+%end if

tests/dictionaries/70container_files/tmpl/rougail.conf

@@ -0,0 +1,10 @@
+%for %%service in %%services
+  %if %%hasattr(%%service, 'files')
+    %for %%file in %%service.files
+      %if %%file.name != %%rougail_filename and %%hasattr(%%file, 'activate') and %%file.activate == True
+C %%file.name %%file.mode %%file.owner %%file.group - /usr/local/share/factory%%file.name
+z %%file.name - - - - -
+      %end if
+    %end for
+  %end if
+%end for