some improvment

test/test_config_api.py

@@ -116,8 +116,26 @@ def test_make_dict_with_disabled():
     config = Config(descr)
     api = getapi(config)
     api.property.read_only()
-    d = api.option.make_dict()
-    assert d == {"s1.a": False, "int": 42}
+    assert api.option.make_dict() == {"s1.a": False, "int": 42}
+    assert api.forcepermissive.option.make_dict() == {"s1.a": False, "int": 42}
+    assert api.unrestraint.option.make_dict() == {"int": 42, "s1.a": False, "s1.b": False, "s2.a": False, "s2.b": False}
+
+
+def test_make_dict_with_disabled_withoption():
+    descr = OptionDescription("opt", "", [
+        OptionDescription("s1", "", [
+            BoolOption("a", "", default=False),
+            BoolOption("b", "", default=False, properties=('disabled',))]),
+        OptionDescription("s2", "", [
+            BoolOption("a", "", default=False),
+            BoolOption("b", "", default=False)], properties=('disabled',)),
+        IntOption("int", "", default=42)])
+    config = Config(descr)
+    api = getapi(config)
+    api.property.read_only()
+    assert api.option.make_dict(withoption="a") == {"s1.a": False}
+    assert api.forcepermissive.option.make_dict(withoption="a") == {"s1.a": False}
+    assert api.unrestraint.option.make_dict(withoption="a") == {"s1.a": False, "s1.b": False, "s2.a": False, "s2.b": False}
 
 
 def test_make_dict_with_disabled_in_callback():

test/test_masterslaves.py

@@ -163,6 +163,26 @@ def test_groups_with_master():
     assert interface1.impl_get_group_type() == groups.master
 
 
+def test_groups_is_master():
+    ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)
+    netmask_admin_eth0 = StrOption('netmask_admin_eth0', "masque du sous-réseau", multi=True, default_multi='value')
+    interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
+    var = StrOption('var', "ip réseau autorisé", multi=True)
+    od2 = OptionDescription('od2', '', [var])
+    od1 = OptionDescription('od', '', [interface1, od2])
+    api = getapi(Config(od1))
+    assert not api.option('od2').option.ismasterslaves()
+    assert api.option('ip_admin_eth0').option.ismasterslaves()
+    assert not api.option('od2.var').option.ismaster()
+    assert not api.option('od2.var').option.isslave()
+    assert api.option('ip_admin_eth0.ip_admin_eth0').option.ismaster()
+    assert not api.option('ip_admin_eth0.ip_admin_eth0').option.isslave()
+    assert not api.option('ip_admin_eth0.netmask_admin_eth0').option.ismaster()
+    assert api.option('ip_admin_eth0.netmask_admin_eth0').option.isslave()
+    assert api.option('ip_admin_eth0.netmask_admin_eth0').option.path() == 'ip_admin_eth0.netmask_admin_eth0'
+    assert api.option('ip_admin_eth0.netmask_admin_eth0').option.defaultmulti() == 'value'
+
+
 if TIRAMISU_VERSION != 2:
     def test_groups_with_master_in_root():
         ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True)

test/test_metaconfig.py

@@ -235,6 +235,7 @@ def test_not_meta():
     raises(ValueError, "GroupConfig(conf1)")
     #same name
     raises(ConflictError, "GroupConfig([conf2, conf4], session_id='conf2')")
+    raises(ConflictError, "GroupConfig([conf2, conf2], session_id='conf8')")
     grp = GroupConfig([conf1, conf2])
     api = getapi(grp)
     raises(ConfigError, "api.option('od1.i1').value.get()")

test/test_requires.py

@@ -126,6 +126,8 @@ def test_requires_same_action():
         props = err.proptype
         submsg = '"disabled" (' + _('the value of "{0}" is {1}').format('activate_service', '"False"') + ')'
         assert str(err) == str(_('cannot access to {0} "{1}" because has {2} {3}').format('option', 'ip_address_service_web', 'property', submsg))
+        #access to cache
+        assert str(err) == str(_('cannot access to {0} "{1}" because has {2} {3}').format('option', 'ip_address_service_web', 'property', submsg))
     assert frozenset(props) == frozenset(['disabled'])
 
 

test/test_symlink.py

@@ -53,6 +53,26 @@ def test_symlink_del_option():
     raises(TypeError, "api.option('c').value.reset()")
 
 
+def test_symlink_addproperties():
+    boolopt = BoolOption('b', '', default=True, properties=('test',))
+    linkopt = SymLinkOption("c", boolopt)
+    descr = OptionDescription('opt', '', [boolopt, linkopt])
+    api = getapi(Config(descr))
+    api.property.read_write()
+    raises(TypeError, "api.option('c').property.add('new')")
+    raises(TypeError, "api.option('c').property.reset()")
+
+
+def test_symlink_addpermissive():
+    boolopt = BoolOption('b', '', default=True, properties=('test',))
+    linkopt = SymLinkOption("c", boolopt)
+    descr = OptionDescription('opt', '', [boolopt, linkopt])
+    api = getapi(Config(descr))
+    api.property.read_write()
+    raises(TypeError, "api.option('c').permissive.set(frozenset(['new']))")
+    raises(TypeError, "api.option('c').permissive.reset()")
+
+
 def test_symlink_getproperties():
     boolopt = BoolOption('b', '', default=True, properties=('test',))
     linkopt = SymLinkOption("c", boolopt)