Merge branch 'master' into orm

Conflicts: tiramisu/setting.py
2014-01-09 20:32:17 +01:00
parent 64ca069a0b 40ecddf242
commit cde04d654a
4 changed files with 45 additions and 6 deletions
--- a/test/test_option_type.py
+++ b/test/test_option_type.py
@ -75,6 +75,16 @@ def test_group_is_hidden():
        prop = err.proptype
    assert 'hidden' in prop

+def test_extend_properties():
+    descr = make_description()
+    config = Config(descr)
+    setting = config.cfgimpl_get_settings()
+    config.read_write()
+    gc = config.unwrap_from_path('gc')
+    config.unwrap_from_path('gc.dummy')
+    setting[gc].extend(['hidden', 'user_defined_property'])
+    assert 'hidden' in setting[gc]
+    assert 'user_defined_property' in setting[gc]

 def test_group_is_hidden_multi():
    descr = make_description()