Infra/tiramisu
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

correction in list with recursion

Browse Source
This commit is contained in:
Emmanuel Garette
2018-09-10 21:59:54 +02:00
parent 5b518bffea
commit 4e5ffb201d
2 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/test_masterslaves.py
View File

@ -110,13 +110,27 @@ def test_iter_on_groups():
descr = make_description()
api = Config(descr)
api.property.read_write()
result = api.option('creole').list('optiondescription', group_type=groups.family)
result = api.option('creole').list('optiondescription',
group_type=groups.family)
group_names = [res.option.name() for res in result]
assert group_names == ['general', 'interface1']
for i in api.option('creole').list('optiondescription', group_type=groups.family):
for i in api.option('creole').list('optiondescription',
group_type=groups.family):
#test StopIteration
break
def test_list_recursive():
descr = make_description()
api = Config(descr)
api.property.read_write()
result = api.option('creole').list('all')
group_names = [res.option.name() for res in result]
assert group_names == ['general', 'interface1']
#
result = list(api.option.list(recursive=True))
group_names = [res.option.name() for res in result]
assert group_names == ['numero_etab', 'nom_machine', 'nombre_interfaces', 'activer_proxy_client', 'mode_conteneur_actif', 'serveur_ntp', 'time_zone', 'ip_admin_eth0', 'netmask_admin_eth0']
def test_iter_on_groups_force_permissive():
descr = make_description()
@ -141,7 +155,8 @@ def test_iter_group_on_groups_force_permissive():
api = Config(descr)
api.property.read_write()
api.permissive.set(frozenset(['hidden']))
result = api.forcepermissive.option('creole').list(type='optiondescription', group_type=groups.family)
result = api.forcepermissive.option('creole').list(type='optiondescription',
group_type=groups.family)
group_names = [res.option.name() for res in result]
assert group_names == ['general', 'interface1', 'new']
@ -151,7 +166,8 @@ def test_iter_on_groups_props():
api = Config(descr)
api.property.read_write()
api.option('creole.interface1').property.add('disabled')
result = api.option('creole').list(type='optiondescription', group_type=groups.family)
result = api.option('creole').list(type='optiondescription',
group_type=groups.family)
group_names = [res.option.name() for res in result]
assert group_names == ['general']