improvemnt information

test/test_option.py

@@ -7,6 +7,7 @@ do_autopath()
 from py.test import raises
 
 from tiramisu.option import IntOption, OptionDescription
+from tiramisu.config import Config
 
 
 def a_func():
@@ -65,6 +66,7 @@ def test_option_get_information():
     description = "it's ok"
     string = 'some informations'
     i = IntOption('test', description)
+    raises(ValueError, "i.impl_get_information('noinfo')")
     i.impl_set_information('info', string)
     assert i.impl_get_information('info') == string
     raises(ValueError, "i.impl_get_information('noinfo')")
@@ -73,6 +75,38 @@ def test_option_get_information():
     assert i.impl_getdoc() == description
 
 
+def test_option_get_information_config():
+    description = "it's ok"
+    string = 'some informations'
+    string
+    i = IntOption('test', description)
+    od = OptionDescription('od', '', [i])
+    Config(od)
+    raises(ValueError, "i.impl_get_information('noinfo')")
+    raises(AttributeError, "i.impl_set_information('info', string)")
+#    assert i.impl_get_information('info') == string
+    raises(ValueError, "i.impl_get_information('noinfo')")
+    assert i.impl_get_information('noinfo', 'default') == 'default'
+    assert i.impl_get_information('doc') == description
+    assert i.impl_getdoc() == description
+
+
+def test_option_get_information_config2():
+    description = "it's ok"
+    string = 'some informations'
+    i = IntOption('test', description)
+    i.impl_set_information('info', string)
+    od = OptionDescription('od', '', [i])
+    Config(od)
+    raises(ValueError, "i.impl_get_information('noinfo')")
+    raises(AttributeError, "i.impl_set_information('info', 'hello')")
+    assert i.impl_get_information('info') == string
+    raises(ValueError, "i.impl_get_information('noinfo')")
+    assert i.impl_get_information('noinfo', 'default') == 'default'
+    assert i.impl_get_information('doc') == description
+    assert i.impl_getdoc() == description
+
+
 def test_optiondescription_get_information():
     description = "it's ok"
     string = 'some informations'

test/test_requires.py

@@ -630,3 +630,27 @@ def test_master_slave_requires():
     cfg.ip_admin_eth0.ip_admin_eth0.append('192.168.1.1')
     assert cfg.ip_admin_eth0.netmask_admin_eth0[0] is None
     raises(PropertiesOptionError, "cfg.ip_admin_eth0.netmask_admin_eth0[1]")
+
+
+def test_master_slave_requires_no_master():
+    activate = BoolOption('activate', "Activer l'accès au réseau", True)
+    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,
+                                   requires=[{'option': activate, 'expected': False, 'action': 'disabled'}])
+    interface1 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
+    interface1.impl_set_group_type(groups.master)
+    maconfig = OptionDescription('toto', '', [activate, interface1])
+    cfg = Config(maconfig)
+    cfg.read_write()
+    assert cfg.ip_admin_eth0.netmask_admin_eth0 == []
+    assert cfg.ip_admin_eth0.ip_admin_eth0 == []
+    cfg.ip_admin_eth0.ip_admin_eth0.append('192.168.1.2')
+    assert cfg.ip_admin_eth0.netmask_admin_eth0 == [None]
+    assert cfg.ip_admin_eth0.netmask_admin_eth0[0] is None
+    assert cfg.ip_admin_eth0.ip_admin_eth0 == ['192.168.1.2']
+    cfg.activate = False
+    cfg.ip_admin_eth0.ip_admin_eth0.append('192.168.1.1')
+    assert cfg.ip_admin_eth0.ip_admin_eth0 == ['192.168.1.2', '192.168.1.1']
+    raises(PropertiesOptionError, "cfg.ip_admin_eth0.netmask_admin_eth0")
+    raises(PropertiesOptionError, "cfg.ip_admin_eth0.netmask_admin_eth0[0]")
+    raises(PropertiesOptionError, "cfg.ip_admin_eth0.netmask_admin_eth0[1]")