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

support of variables's file_name

Browse Source
This commit is contained in:
Emmanuel Garette
2019-12-22 11:04:39 +01:00
parent 3881cb7e98
commit 1ce16ad05d
10 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/flattener_dicos/60action_external/extra_dirs/extra/00-base.xml
View File

@ -8,7 +8,7 @@
description="Reconfigurer le serveur"
image="backup.svg"
url="extra.test.calc_url"
url_type="SymLinkOption">
url_type="variable">
<input>Reconfigurer</input>
<profile>ead_admin</profile>
<ewtapp>ead</ewtapp>

2
tests/flattener_dicos/70container_files_symlink_multi/00-base.xml
View File

@ -2,7 +2,7 @@
<creole>
<containers>
<container name='test' id='23'>
<file name='file_name' name_type="SymLinkOption" source="mailname"/>
<file name='file_name' name_type="variable" source="mailname"/>
</container>
</containers>
<variables>

2
tests/flattener_dicos/70container_fstabsymlink/00-base.xml
View File

@ -4,7 +4,7 @@
<containers>
<container name='test' id='23'>
<fstab name='path_fstab' name_type="SymLinkOption"/>
<fstab name='path_fstab' name_type="variable"/>
</container>
</containers>

2
tests/flattener_dicos/70container_pathaccess/00-base.xml
View File

@ -5,7 +5,7 @@
<containers>
<container name='test' id='23'>
<service_restriction service='nut'>
<ip interface='auto' netmask='nut_monitor_netmask' netmask_type='SymLinkOption' ip_type='SymLinkOption'>nut_monitor_host</ip>
<ip interface='auto' netmask='nut_monitor_netmask' netmask_type='variable' ip_type='variable'>nut_monitor_host</ip>
</service_restriction>
</container>

2
tests/flattener_dicos/70container_pathaccess_masterslaves/00-base.xml
View File

@ -5,7 +5,7 @@
<containers>
<container name='test' id='23'>
<service_restriction service='nut'>
<ip interface='auto' netmask='nut_monitor_netmask' netmask_type='SymLinkOption' ip_type='SymLinkOption'>nut_monitor_host</ip>
<ip interface='auto' netmask='nut_monitor_netmask' netmask_type='variable' ip_type='variable'>nut_monitor_host</ip>
</service_restriction>
</container>

2
tests/flattener_dicos/80container_files_symlink_without_source/00-base.xml
View File

@ -2,7 +2,7 @@
<creole>
<containers>
<container name='test' id='23'>
<file name='file_name' name_type="SymLinkOption"/>
<file name='file_name' name_type="variable"/>
</container>
</containers>
<variables>

1
tests/templates/00base/result/mailname
View File

@ -1 +0,0 @@
oui

1
tests/templates/11disabled_if_in_filelist/result/file
View File

@ -1 +0,0 @@
non

20
tests/test_template.py
View File

@ -18,6 +18,16 @@ def test_dir(request):
return request.param
def find_files(dirname, root, files):
for filename in listdir(dirname):
abs_dirname = join(dirname, filename)
root_file = root + [filename]
if isdir(join(dirname, filename)):
find_files(abs_dirname, root_file, files)
else:
files.add(join(*root_file))
def test_dictionary(test_dir):
test_dir = join(template_dirs, test_dir)
tmp_dir = join(test_dir, 'tmp')
@ -45,13 +55,15 @@ def test_dictionary(test_dir):
dest_dir)
if isdir(join(dest_dir, 'test')):
list_templates = set(listdir(join(dest_dir, 'test')))
list_templates = set()
find_files(join(dest_dir), [], list_templates)
else:
list_templates = set()
list_results = set(listdir(join(test_dir, 'result')))
list_results = set()
find_files(join(test_dir, 'result'), [], list_results)
assert list_templates == list_results
for result in listdir(join(test_dir, 'result')):
template_file = join(dest_dir, 'test', result)
for result in list_results:
template_file = join(dest_dir, result)
if not isfile(template_file):
raise Exception(f'{template_file} is not generated')
with open(join(test_dir, 'result', result), 'r') as fh: