we can serialize Config now

test/test_option_setting.py

@@ -327,23 +327,23 @@ def test_reset_properties():
     cfg = Config(descr)
     setting = cfg.cfgimpl_get_settings()
     option = cfg.cfgimpl_get_description().gc.dummy
-    assert setting._p_.get_properties(cfg) == {}
+    assert setting._p_.get_modified_properties() == {}
     setting.append('frozen')
-    assert setting._p_.get_properties(cfg) == {None: set(('frozen', 'expire', 'cache', 'validator'))}
+    assert setting._p_.get_modified_properties() == {None: set(('frozen', 'expire', 'cache', 'validator'))}
     setting.reset()
-    assert setting._p_.get_properties(cfg) == {}
+    assert setting._p_.get_modified_properties() == {}
     setting[option].append('test')
-    assert setting._p_.get_properties(cfg) == {'gc.dummy': set(('test',))}
+    assert setting._p_.get_modified_properties() == {'gc.dummy': set(('test',))}
     setting.reset()
-    assert setting._p_.get_properties(cfg) == {'gc.dummy': set(('test',))}
+    assert setting._p_.get_modified_properties() == {'gc.dummy': set(('test',))}
     setting.append('frozen')
-    assert setting._p_.get_properties(cfg) == {None: set(('frozen', 'expire', 'validator', 'cache')), 'gc.dummy': set(('test',))}
+    assert setting._p_.get_modified_properties() == {None: set(('frozen', 'expire', 'validator', 'cache')), 'gc.dummy': set(('test',))}
     setting.reset(option)
-    assert setting._p_.get_properties(cfg) == {None: set(('frozen', 'expire', 'validator', 'cache'))}
+    assert setting._p_.get_modified_properties() == {None: set(('frozen', 'expire', 'validator', 'cache'))}
     setting[option].append('test')
-    assert setting._p_.get_properties(cfg) == {None: set(('frozen', 'expire', 'validator', 'cache')), 'gc.dummy': set(('test',))}
+    assert setting._p_.get_modified_properties() == {None: set(('frozen', 'expire', 'validator', 'cache')), 'gc.dummy': set(('test',))}
     setting.reset(all_properties=True)
-    assert setting._p_.get_properties(cfg) == {}
+    assert setting._p_.get_modified_properties() == {}
     raises(ValueError, 'setting.reset(all_properties=True, opt=option)')
     a = descr.wantref
     setting[a].append('test')

test/test_state.py

@@ -1,5 +1,9 @@
 from tiramisu.option import BoolOption, UnicodeOption, SymLinkOption, \
     OptionDescription
+from tiramisu.config import Config
+from tiramisu.setting import owners
+from tiramisu.storage import delete_session
+from tiramisu.error import ConfigError
 from pickle import dumps, loads
 
 
@@ -152,3 +156,95 @@ def test_no_state_attr():
     _no_state(q.o.b)
     _no_state(q.o.u)
     _no_state(q.o.s)
+
+
+def test_state_config():
+    val1 = BoolOption('val1', "")
+    maconfig = OptionDescription('rootconfig', '', [val1])
+    try:
+        cfg = Config(maconfig, persistent=True, session_id='29090931')
+    except ValueError:
+        cfg = Config(maconfig, session_id='29090931')
+        cfg._impl_test = True
+    a = dumps(cfg)
+    q = loads(a)
+    _diff_opt(maconfig, q.cfgimpl_get_description())
+    assert cfg.cfgimpl_get_values().get_modified_values() == q.cfgimpl_get_values().get_modified_values()
+    assert cfg.cfgimpl_get_settings().get_modified_properties() == q.cfgimpl_get_settings().get_modified_properties()
+    assert cfg.cfgimpl_get_settings().get_modified_permissives() == q.cfgimpl_get_settings().get_modified_permissives()
+    try:
+        delete_session('29090931')
+    except ConfigError:
+        pass
+
+
+def test_state_properties():
+    val1 = BoolOption('val1', "")
+    maconfig = OptionDescription('rootconfig', '', [val1])
+    try:
+        cfg = Config(maconfig, persistent=True, session_id='29090932')
+    except ValueError:
+        cfg = Config(maconfig, session_id='29090932')
+        cfg._impl_test = True
+    cfg.read_write()
+    cfg.cfgimpl_get_settings()[val1].append('test')
+    a = dumps(cfg)
+    q = loads(a)
+    _diff_opt(maconfig, q.cfgimpl_get_description())
+    assert cfg.cfgimpl_get_values().get_modified_values() == q.cfgimpl_get_values().get_modified_values()
+    assert cfg.cfgimpl_get_settings().get_modified_properties() == q.cfgimpl_get_settings().get_modified_properties()
+    assert cfg.cfgimpl_get_settings().get_modified_permissives() == q.cfgimpl_get_settings().get_modified_permissives()
+    try:
+        delete_session('29090931')
+    except ConfigError:
+        pass
+
+
+def test_state_values():
+    val1 = BoolOption('val1', "")
+    maconfig = OptionDescription('rootconfig', '', [val1])
+    try:
+        cfg = Config(maconfig, persistent=True, session_id='29090933')
+    except ValueError:
+        cfg = Config(maconfig, session_id='29090933')
+        cfg._impl_test = True
+    cfg.val1 = True
+    a = dumps(cfg)
+    q = loads(a)
+    _diff_opt(maconfig, q.cfgimpl_get_description())
+    assert cfg.cfgimpl_get_values().get_modified_values() == q.cfgimpl_get_values().get_modified_values()
+    assert cfg.cfgimpl_get_settings().get_modified_properties() == q.cfgimpl_get_settings().get_modified_properties()
+    assert cfg.cfgimpl_get_settings().get_modified_permissives() == q.cfgimpl_get_settings().get_modified_permissives()
+    q.val1 = False
+    #assert cfg.val1 is True
+    assert q.val1 is False
+    try:
+        delete_session('29090931')
+    except ConfigError:
+        pass
+
+
+def test_state_values_owner():
+    val1 = BoolOption('val1', "")
+    maconfig = OptionDescription('rootconfig', '', [val1])
+    try:
+        cfg = Config(maconfig, persistent=True, session_id='29090934')
+    except ValueError:
+        cfg = Config(maconfig, session_id='29090934')
+        cfg._impl_test = True
+    owners.addowner('newowner')
+    cfg.cfgimpl_get_settings().setowner(owners.newowner)
+    cfg.val1 = True
+    a = dumps(cfg)
+    q = loads(a)
+    _diff_opt(maconfig, q.cfgimpl_get_description())
+    assert cfg.cfgimpl_get_values().get_modified_values() == q.cfgimpl_get_values().get_modified_values()
+    assert cfg.cfgimpl_get_settings().get_modified_properties() == q.cfgimpl_get_settings().get_modified_properties()
+    assert cfg.cfgimpl_get_settings().get_modified_permissives() == q.cfgimpl_get_settings().get_modified_permissives()
+    q.val1 = False
+    nval1 = q.cfgimpl_get_description().val1
+    assert q.getowner(nval1) == owners.newowner
+    try:
+        delete_session('29090931')
+    except ConfigError:
+        pass