Works callback/multi/master-slave

- in multi, never modify _default value
- _reset slave when _reset master
- if append None in master with callback return not a list, replace None by the value
- list support in slave

test/test_option_calculation.py

@@ -5,13 +5,21 @@ from tiramisu.setting import groups
 from tiramisu.config import Config
 from tiramisu.option import ChoiceOption, BoolOption, IntOption, FloatOption, \
     StrOption, OptionDescription
-from tiramisu.error import PropertiesOptionError, ConflictError
+from tiramisu.error import PropertiesOptionError, ConflictError, SlaveError
 
 
-def return_value():
+def return_val():
     return 'val'
 
 
+def return_list():
+    return ['val', 'val']
+
+
+def return_value(value):
+    return value
+
+
 def make_description():
     gcoption = ChoiceOption('name', 'GC name', ('ref', 'framework'), 'ref')
     gcdummy = BoolOption('dummy', 'dummy', default=False)
@@ -277,7 +285,7 @@ def test_freeze_and_has_callback():
 
 
 def test_callback():
-    val1 = StrOption('val1', "", callback=return_value)
+    val1 = StrOption('val1', "", callback=return_val)
     maconfig = OptionDescription('rootconfig', '', [val1])
     cfg = Config(maconfig)
     cfg.read_write()
@@ -288,9 +296,115 @@ def test_callback():
     assert cfg.val1 == 'val'
 
 
-def test_callback_master_and_slaves():
+def test_callback_value():
+    val1 = StrOption('val1', "", 'val')
+    val2 = StrOption('val2', "", callback=return_value, callback_params={'': (('val1', False),)})
+    maconfig = OptionDescription('rootconfig', '', [val1, val2])
+    cfg = Config(maconfig)
+    cfg.read_write()
+    assert cfg.val1 == 'val'
+    assert cfg.val2 == 'val'
+    cfg.val1 = 'new-val'
+    assert cfg.val1 == 'new-val'
+    assert cfg.val2 == 'new-val'
+    del(cfg.val1)
+    assert cfg.val1 == 'val'
+    assert cfg.val2 == 'val'
+
+
+def test_callback_list():
+    val1 = StrOption('val1', "", callback=return_list)
+    maconfig = OptionDescription('rootconfig', '', [val1])
+    cfg = Config(maconfig)
+    cfg.read_write()
+    raises(ValueError, "cfg.val1")
+
+
+def test_callback_multi():
+    val1 = StrOption('val1', "", callback=return_val, multi=True)
+    maconfig = OptionDescription('rootconfig', '', [val1])
+    cfg = Config(maconfig)
+    cfg.read_write()
+    assert cfg.val1 == ['val']
+    cfg.val1 = ['new-val']
+    assert cfg.val1 == ['new-val']
+    cfg.val1.append('new-val2')
+    assert cfg.val1 == ['new-val', 'new-val2']
+    del(cfg.val1)
+    assert cfg.val1 == ['val']
+
+
+def test_callback_multi_value():
+    val1 = StrOption('val1', "", ['val'], multi=True)
+    val2 = StrOption('val2', "", multi=True, callback=return_value, callback_params={'': (('val1', False),)})
+    maconfig = OptionDescription('rootconfig', '', [val1, val2])
+    cfg = Config(maconfig)
+    cfg.read_write()
+    assert cfg.val1 == ['val']
+    assert cfg.val2 == ['val']
+    cfg.val1 = ['new-val']
+    assert cfg.val1 == ['new-val']
+    assert cfg.val2 == ['new-val']
+    cfg.val1.append('new-val2')
+    assert cfg.val1 == ['new-val', 'new-val2']
+    assert cfg.val2 == ['new-val', 'new-val2']
+    del(cfg.val1)
+    assert cfg.val1 == ['val']
+    assert cfg.val2 == ['val']
+
+
+def test_callback_multi_list():
+    val1 = StrOption('val1', "", callback=return_list, multi=True)
+    maconfig = OptionDescription('rootconfig', '', [val1])
+    cfg = Config(maconfig)
+    cfg.read_write()
+    assert cfg.val1 == ['val', 'val']
+    cfg.val1 = ['new-val']
+    assert cfg.val1 == ['new-val']
+    cfg.val1.append('new-val2')
+    assert cfg.val1 == ['new-val', 'new-val2']
+    del(cfg.val1)
+    assert cfg.val1 == ['val', 'val']
+
+
+def test_callback_master_and_slaves_master():
+    val1 = StrOption('val1', "", multi=True, callback=return_val)
+    val2 = StrOption('val2', "", multi=True)
+    interface1 = OptionDescription('val1', '', [val1, val2])
+    interface1.impl_set_group_type(groups.master)
+    maconfig = OptionDescription('rootconfig', '', [interface1])
+    cfg = Config(maconfig)
+    cfg.read_write()
+    assert cfg.val1.val1 == ['val']
+    cfg.val1.val1.append(None)
+    assert cfg.val1.val1 == ['val', 'val']
+    assert cfg.val1.val2 == [None, None]
+
+
+def test_callback_master_and_slaves_master_list():
+    val1 = StrOption('val1', "", multi=True, callback=return_list)
+    val2 = StrOption('val2', "", multi=True)
+    interface1 = OptionDescription('val1', '', [val1, val2])
+    interface1.impl_set_group_type(groups.master)
+    maconfig = OptionDescription('rootconfig', '', [interface1])
+    cfg = Config(maconfig)
+    cfg.read_write()
+    assert cfg.val1.val1 == ['val', 'val']
+    assert cfg.val1.val2 == [None, None]
+    cfg.val1.val1.append(None)
+    assert cfg.val1.val1 == ['val', 'val', None]
+    assert cfg.val1.val2 == [None, None, None]
+    del(cfg.val1.val1)
+    assert cfg.val1.val1 == ['val', 'val']
+    assert cfg.val1.val2 == [None, None]
+    assert cfg.val1.val1.pop(1)
+    assert cfg.val1.val1 == ['val']
+    assert cfg.val1.val2 == [None]
+
+
+def test_callback_master_and_slaves_slave():
     val1 = StrOption('val1', "", multi=True)
-    val2 = StrOption('val2', "", multi=True, callback=return_value)
+    val2 = StrOption('val2', "", multi=True, callback=return_val)
     interface1 = OptionDescription('val1', '', [val1, val2])
     interface1.impl_set_group_type(groups.master)
     maconfig = OptionDescription('rootconfig', '', [interface1])
@@ -320,3 +434,56 @@ def test_callback_master_and_slaves():
     #
     cfg.val1.val1.append('val3')
     assert cfg.val1.val2 == ['val2', 'val2', 'val']
+
+
+def test_callback_master_and_slaves_slave_list():
+    val1 = StrOption('val1', "", multi=True)
+    val2 = StrOption('val2', "", multi=True, callback=return_list)
+    interface1 = OptionDescription('val1', '', [val1, val2])
+    interface1.impl_set_group_type(groups.master)
+    maconfig = OptionDescription('rootconfig', '', [interface1])
+    cfg = Config(maconfig)
+    cfg.read_write()
+    assert cfg.val1.val2 == []
+    cfg.val1.val1 = ['val1', 'val2']
+    assert cfg.val1.val1 == ['val1', 'val2']
+    assert cfg.val1.val2 == ['val', 'val']
+    cfg.val1.val1 = ['val1']
+    #wrong len
+    raises(SlaveError, 'cfg.val1.val2')
+
+
+def test_callback_master_and_slaves_value():
+    val1 = StrOption('val1', "", multi=True)
+    val2 = StrOption('val2', "", multi=True, callback=return_value, callback_params={'': (('val1.val1', False),)})
+    interface1 = OptionDescription('val1', '', [val1, val2])
+    interface1.impl_set_group_type(groups.master)
+    maconfig = OptionDescription('rootconfig', '', [interface1])
+    cfg = Config(maconfig)
+    cfg.read_write()
+    assert cfg.val1.val1 == []
+    assert cfg.val1.val2 == []
+    #
+    cfg.val1.val1 = ['val1']
+    assert cfg.val1.val1 == ['val1']
+    assert cfg.val1.val2 == ['val1']
+    #
+    cfg.val1.val1.append('val2')
+    assert cfg.val1.val1 == ['val1', 'val2']
+    assert cfg.val1.val2 == ['val1', 'val2']
+    #
+    cfg.val1.val1 = ['val1', 'val2', 'val3']
+    assert cfg.val1.val1 == ['val1', 'val2', 'val3']
+    assert cfg.val1.val2 == ['val1', 'val2', 'val3']
+    #
+    cfg.val1.val1.pop(2)
+    assert cfg.val1.val1 == ['val1', 'val2']
+    assert cfg.val1.val2 == ['val1', 'val2']
+    #
+    cfg.val1.val2 = ['val2', 'val2']
+    assert cfg.val1.val2 == ['val2', 'val2']
+    #
+    cfg.val1.val1.append('val3')
+    assert cfg.val1.val2 == ['val2', 'val2', 'val3']
+
+