Infra/rougail
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include => included fixes #2

Browse Source
This commit is contained in:
Emmanuel Garette
2021-02-21 16:58:56 +01:00
parent b094e5a6ca
commit c149d7c38d
82 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/dictionaries/01base_file_include_content/00-base.xml
View File

@ -5,7 +5,7 @@
<service name="test">
<file>/etc/file</file>
<file engine="jinja2">/etc/file2</file>
<file include="content">/etc/dir/incfile</file>
<file included="content">/etc/dir/incfile</file>
</service>
</services>

2
tests/dictionaries/01base_file_include_content/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true, "services.test.files.file2.engine": "jinja2", "services.test.files.file2.group": "root", "services.test.files.file2.include": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/etc/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true, "services.test.files.incfile.engine": "creole", "services.test.files.incfile.group": "root", "services.test.files.incfile.include": "content", "services.test.files.incfile.mode": "0644", "services.test.files.incfile.name": "/etc/dir/incfile", "services.test.files.incfile.owner": "root", "services.test.files.incfile.source": "incfile", "services.test.files.incfile.activate": true}
{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true, "services.test.files.file2.engine": "jinja2", "services.test.files.file2.group": "root", "services.test.files.file2.included": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/etc/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true, "services.test.files.incfile.engine": "creole", "services.test.files.incfile.group": "root", "services.test.files.incfile.included": "content", "services.test.files.incfile.mode": "0644", "services.test.files.incfile.name": "/etc/dir/incfile", "services.test.files.incfile.owner": "root", "services.test.files.incfile.source": "incfile", "services.test.files.incfile.activate": true}

6
tests/dictionaries/01base_file_include_content/tiramisu/base.py
View File

@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3],
option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
option_8 = StrOption(name="engine", doc="engine", default="creole")
option_9 = StrOption(name="group", doc="group", default="root")
option_10 = StrOption(name="include", doc="include", default="no")
option_10 = StrOption(name="included", doc="included", default="no")
option_11 = StrOption(name="mode", doc="mode", default="0644")
option_12 = FilenameOption(name="name", doc="name", default="/etc/file")
option_13 = StrOption(name="owner", doc="owner", default="root")
@ -25,7 +25,7 @@ option_15 = BoolOption(name="activate", doc="activate", default=True)
option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
option_17 = StrOption(name="engine", doc="engine", default="jinja2")
option_18 = StrOption(name="group", doc="group", default="root")
option_19 = StrOption(name="include", doc="include", default="no")
option_19 = StrOption(name="included", doc="included", default="no")
option_20 = StrOption(name="mode", doc="mode", default="0644")
option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
option_22 = StrOption(name="owner", doc="owner", default="root")
@ -34,7 +34,7 @@ option_24 = BoolOption(name="activate", doc="activate", default=True)
option_16 = OptionDescription(name="file2", doc="file2", children=[option_17, option_18, option_19, option_20, option_21, option_22, option_23, option_24])
option_26 = StrOption(name="engine", doc="engine", default="creole")
option_27 = StrOption(name="group", doc="group", default="root")
option_28 = StrOption(name="include", doc="include", default="content")
option_28 = StrOption(name="included", doc="included", default="content")
option_29 = StrOption(name="mode", doc="mode", default="0644")
option_30 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
option_31 = StrOption(name="owner", doc="owner", default="root")