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

add check_frozen in slave

This commit is contained in:
Emmanuel Garette 2017-05-06 19:54:20 +02:00
parent b4cab93e85
commit ac5bf93953
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/test_mandatory.py
View File

@ -549,6 +549,15 @@ def test_mandatory_master_empty():
config.read_only() config.read_only()
assert config.ip_admin_eth0.ip_admin_eth0 == ['ip'] assert config.ip_admin_eth0.ip_admin_eth0 == ['ip']
assert config.ip_admin_eth0.netmask_admin_eth0 == [None] assert config.ip_admin_eth0.netmask_admin_eth0 == [None]
#
config.read_write()
config.ip_admin_eth0.netmask_admin_eth0 = ['ip2']
config.read_only()
raises(PropertiesOptionError, "del(config.ip_admin_eth0.netmask_admin_eth0)")
raises(PropertiesOptionError, "del(config.ip_admin_eth0.ip_admin_eth0)")
config.read_write()
del(config.ip_admin_eth0.netmask_admin_eth0)
del(config.ip_admin_eth0.ip_admin_eth0)
try: try:
delete_session('config', 'man106') delete_session('config', 'man106')
except ValueError: except ValueError:

2
tiramisu/option/masterslave.py
View File

@ -193,7 +193,7 @@ class MasterSlaves(object):
#if masterlen == 0: #if masterlen == 0:
if validate_properties: if validate_properties:
props = context.cfgimpl_get_settings().validate_properties(opt, False, props = context.cfgimpl_get_settings().validate_properties(opt, False,
False, check_frozen,
value=multi, value=multi,
path=path, path=path,
force_permissive=force_permissive, force_permissive=force_permissive,