coverage

test/test_cache.py

@@ -565,7 +565,9 @@ def test_callback_value_incr():
     val2 = IntOption('val2', "", callback=return_value, callback_params=Params(kwargs={'value': ParamOption(val1)}))
     maconfig = OptionDescription('rootconfig', '', [val1, val2])
     cfg = Config(maconfig)
-    cfg.cache.expiration_time(1)
+    assert cfg.cache.get_expiration_time() == 5
+    cfg.cache.set_expiration_time(1)
+    assert cfg.cache.get_expiration_time() == 1
     cfg.property.read_write()
     assert cfg.option('val1').value.get() == 1
     sleep(1)

test/test_leadership.py

@@ -7,7 +7,6 @@ from tiramisu.setting import groups, owners
 from tiramisu import ChoiceOption, BoolOption, IntOption, IPOption, NetmaskOption, \
     StrOption, OptionDescription, Leadership, Config
 from tiramisu.error import LeadershipError, PropertiesOptionError, APIError, ConfigError
-from tiramisu.api import TIRAMISU_VERSION
 from tiramisu.storage import list_sessions
 
 
@@ -107,7 +106,6 @@ def test_get_group_type():
     assert grp.group_type() == groups.family
     assert grp.group_type() == 'family'
     assert isinstance(grp.group_type(), groups.GroupType)
-    #raises(TypeError, 'grp.impl_set_group_type(groups.default)')
 
 
 def test_iter_on_groups():
@@ -237,12 +235,12 @@ def test_groups_is_leader():
     assert api.option('leadership.netmask_admin_eth0').option.defaultmulti() == 'value'
 
 
-if TIRAMISU_VERSION != 2:
-    def test_groups_with_leader_in_root():
-        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)
-        interface1 = Leadership('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
-        raises(ConfigError, "Config(interface1)")
+def test_groups_with_leader_in_root():
+    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)
+    interface1 = Leadership('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
+    interface1
+    raises(ConfigError, "Config(interface1)")
 
 
 def test_groups_with_leader_in_config():
@@ -269,6 +267,44 @@ def test_groups_with_leader_make_dict():
     assert api.value.dict() == {'ip_admin_eth0.ip_admin_eth0': ['ip1', 'ip2'], 'ip_admin_eth0.netmask_admin_eth0': [None, None]}
 
 
+def test_groups_with_leader_default_value():
+    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)
+    interface1 = Leadership('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
+    od = OptionDescription('root', '', [interface1])
+    api = Config(od)
+    assert api.option('ip_admin_eth0.ip_admin_eth0').value.get() == []
+    assert api.option('ip_admin_eth0.ip_admin_eth0').value.default() == []
+    api.option('ip_admin_eth0.ip_admin_eth0').value.set(['ip1', 'ip2'])
+    assert api.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['ip1', 'ip2']
+    assert api.option('ip_admin_eth0.ip_admin_eth0').value.default() == []
+
+
+def test_groups_with_leader_default_value_2():
+    ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", ['ip1', 'ip2'], multi=True)
+    netmask_admin_eth0 = StrOption('netmask_admin_eth0', "masque du sous-réseau", default_multi='netmask1', multi=True)
+    interface1 = Leadership('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
+    od = OptionDescription('root', '', [interface1])
+    api = Config(od)
+    assert api.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['ip1', 'ip2']
+    assert api.option('ip_admin_eth0.ip_admin_eth0').value.default() == ['ip1', 'ip2']
+    api.option('ip_admin_eth0.ip_admin_eth0').value.set(['ip3', 'ip4'])
+    assert api.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['ip3', 'ip4']
+    assert api.option('ip_admin_eth0.ip_admin_eth0').value.default() == ['ip1', 'ip2']
+    #
+    assert api.option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == 'netmask1'
+    assert api.option('ip_admin_eth0.netmask_admin_eth0', 1).value.get() == 'netmask1'
+    assert api.option('ip_admin_eth0.netmask_admin_eth0', 0).value.default() == 'netmask1'
+    assert api.option('ip_admin_eth0.netmask_admin_eth0', 1).value.default() == 'netmask1'
+    assert api.option('ip_admin_eth0.netmask_admin_eth0').value.default() == ['netmask1', 'netmask1']
+    api.option('ip_admin_eth0.netmask_admin_eth0', 1).value.set('netmask2')
+    assert api.option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == 'netmask1'
+    assert api.option('ip_admin_eth0.netmask_admin_eth0', 1).value.get() == 'netmask2'
+    assert api.option('ip_admin_eth0.netmask_admin_eth0', 0).value.default() == 'netmask1'
+    assert api.option('ip_admin_eth0.netmask_admin_eth0', 1).value.default() == 'netmask1'
+    assert api.option('ip_admin_eth0.netmask_admin_eth0').value.default() == ['netmask1', 'netmask1']
+
+
 def test_groups_with_leader_hidden_in_config():
     ip_admin_eth0 = StrOption('ip_admin_eth0', "ip réseau autorisé", multi=True, properties=('hidden',))
     netmask_admin_eth0 = StrOption('netmask_admin_eth0', "masque du sous-réseau", multi=True, properties=('hidden',))

test/test_option_setting.py

@@ -557,6 +557,26 @@ def test_reset_properties_force_store_value():
              'gc.dummy': set(('test', 'force_store_value'))}
 
 
+def test_importation_force_store_value():
+    gcdummy = BoolOption('dummy', 'dummy', default=False,
+                         properties=('force_store_value',))
+    gcgroup = OptionDescription('gc', '', [gcdummy])
+    descr = OptionDescription('tiramisu', '', [gcgroup])
+    config1 = Config(descr)
+    assert config1.value.exportation() == [[], [], [], []]
+    config1.property.add('frozen')
+    assert config1.value.exportation() == [[], [], [], []]
+    config1.property.add('force_store_value')
+    assert config1.value.exportation() == [['gc.dummy'], [None], [False], ['forced']]
+    exportation = config1.property.exportation()
+    config2 = Config(descr)
+    assert config2.value.exportation() == [[], [], [], []]
+    config2.property.importation(exportation)
+    assert config2.value.exportation() == [['gc.dummy'], [None], [False], ['forced']]
+    config2.property.importation(exportation)
+    assert config2.value.exportation() == [['gc.dummy'], [None], [False], ['forced']]
+
+
 def test_set_modified_value():
     gcdummy = BoolOption('dummy', 'dummy', default=False, properties=('force_store_value',))
     gcgroup = OptionDescription('gc', '', [gcdummy])