works on permissive

test/new_api/test_config.py

@@ -83,7 +83,7 @@ def test_base_config_force_permissive():
     config = Config(descr)
     api = getapi(config)
     api.property.read_write()
-    api.permissive.set(('hidden',))
+    api.permissive.set(frozenset(['hidden']))
     raises(PropertiesOptionError, "api.option('boolop').value.get()")
     assert api.forcepermissive.option('boolop').value.get() is True
 

test/new_api/test_config_api.py

@@ -90,7 +90,7 @@ def test_make_dict():
     config = Config(descr)
     api = getapi(config)
     api.property.read_write()
-    api.permissive.set(('hidden',))
+    api.permissive.set(frozenset(['hidden']))
     d = api.option.make_dict()
     assert d == {"s1.a": False, "int": 42}
     api.option('int').value.set(43)
@@ -162,7 +162,7 @@ def test_find_in_config():
     conf = Config(descr)
     api = getapi(conf)
     api.property.read_only()
-    api.permissive.set(('hidden',))
+    api.permissive.set(frozenset(['hidden']))
     ret = api.option.find('dummy')
     assert len(ret) == 1
     _is_same_opt(ret[0], api.option.get('gc.dummy'))

test/new_api/test_mandatory.py

@@ -363,7 +363,7 @@ def test_mandatory_warnings_hidden():
     api = getapi(Config(descr))
     api.option('str').value.set('')
     api.property.read_write()
-    api.permissive.set(('hidden',))
+    api.permissive.set(frozenset(['hidden']))
     api.option('str').value.get()
     assert set(api.value.mandatory_warnings()) == {'str', 'str1', 'unicode2', 'str3'}
     api.option('str').property.add('hidden')

test/new_api/test_option_calculation.py

@@ -633,7 +633,7 @@ def test_callback_master_and_slaves_master4():
     api = getapi(Config(maconfig))
     api.property.read_write()
     api.property.add('expert')
-    api.permissive.set(['expert'])
+    api.permissive.set(frozenset(['expert']))
     assert list(api.value.mandatory_warnings()) == []
 
 
@@ -998,7 +998,7 @@ def test_callback_two_disabled2():
     maconfig = OptionDescription('rootconfig', '', [od1, od2])
     api = getapi(Config(maconfig))
     api.property.read_write()
-    api.permissive.set(['hidden'])
+    api.permissive.set(frozenset(['hidden']))
     raises(PropertiesOptionError, "api.option('od2.opt2').value.get()")
     assert api.forcepermissive.option('od2.opt2').owner.isdefault()
 

test/new_api/test_option_consistency.py

@@ -703,7 +703,7 @@ def test_consistency_permissive():
     a.impl_add_consistency('not_equal', b)
     api = getapi(Config(od))
     api.property.read_write()
-    api.permissive.set(('hidden',))
+    api.permissive.set(frozenset(['hidden']))
     api.option('a').value.set(1)
 
 

test/new_api/test_option_owner.py

@@ -50,7 +50,7 @@ def test_hidden_owner():
     #raises(PropertiesOptionError, "api.forcepermissive.option('dummy').owner.get()")
     #raises(PropertiesOptionError, "api.option('dummy').owner.isdefault()")
     #raises(PropertiesOptionError, "api.forcepermissive.option('dummy').owner.isdefault()")
-    api.permissive.set(('hidden',))
+    api.permissive.set(frozenset(['hidden']))
     api.forcepermissive.option('dummy').value.get()
     api.forcepermissive.option('dummy').owner.isdefault()
 

test/new_api/test_option_setting.py

@@ -542,7 +542,7 @@ def test_pprint():
     except Exception as error:
         err = error
 
-    assert str(err) == msg_error.format('option', 'string', properties, display_list(['disabled', 'hidden']))
+    assert str(err) == msg_error.format('option', 'string', properties, display_list(['disabled', 'hidden'], add_quote=True))
 
     err = None
     try:
@@ -550,4 +550,4 @@ def test_pprint():
     except Exception as error:
         err = error
 
-    assert str(err) == msg_error.format('option', 'string3', prop, 'hidden')
+    assert str(err) == msg_error.format('option', 'string3', prop, '"hidden"')

test/new_api/test_option_with_special_name.py

@@ -0,0 +1,59 @@
+#this test is much more to test that **it's there** and answers attribute access
+from .autopath import do_autopath
+do_autopath()
+
+from py.test import raises
+
+from tiramisu import BoolOption, OptionDescription, ChoiceOption,\
+    IntOption, FloatOption, StrOption, Config, getapi
+
+
+def make_description():
+    gcoption = ChoiceOption('name', 'GC name', ['ref', 'framework'], 'ref')
+    gcdummy = BoolOption('dummy', 'dummy', default=False)
+    gcdummy2 = BoolOption('hide', 'dummy', default=True)
+    objspaceoption = ChoiceOption('objspace', 'Object space',
+                                  ['std', 'thunk'], 'std')
+    booloption = BoolOption('bool', 'Test boolean option', default=True)
+    intoption = IntOption('int', 'Test int option', default=0)
+    floatoption = FloatOption('float', 'Test float option', default=2.3)
+    stroption = StrOption('str', 'Test string option', default="abc")
+    boolop = BoolOption('boolop', 'Test boolean option op', default=True)
+    wantref_option = BoolOption('wantref', 'Test requires', default=False)
+    wantframework_option = BoolOption('wantframework', 'Test requires',
+                                      default=False)
+
+    gcgroup = OptionDescription('gc', '', [gcoption, gcdummy, floatoption, gcdummy2])
+    descr = OptionDescription('tiram', '', [gcgroup, booloption, objspaceoption,
+                                            wantref_option, stroption,
+                                            wantframework_option,
+                                            intoption, boolop])
+    return descr
+
+
+def test_root_config_answers_ok():
+    "if you hide the root config, the options in this namespace behave normally"
+    gcdummy = BoolOption('dummy', 'dummy', default=False)
+    boolop = BoolOption('boolop', 'Test boolean option op', default=True)
+    descr = OptionDescription('tiramisu', '', [gcdummy, boolop])
+    api = getapi(Config(descr))
+    #settings = cfg.cfgimpl_get_settings()
+    #settings.append('hidden')
+
+    assert api.option('dummy').value.get() is False
+    assert api.option('boolop').value.get() is True
+
+
+def test_optname_shall_not_start_with_numbers():
+    raises(ValueError, "gcdummy = BoolOption('123dummy', 'dummy', default=False)")
+    raises(ValueError, "descr = OptionDescription('123tiramisu', '', [])")
+
+
+def test_option_has_an_api_name():
+    raises(ValueError, "BoolOption('cfgimpl_get_settings', 'dummy', default=False)")
+    raises(ValueError, "BoolOption('unwrap_from_path', 'dummy', default=False)")
+    raises(ValueError, "BoolOption('impl_getdoc', 'dummy', default=False)")
+    raises(ValueError, "BoolOption('_unvalid', 'dummy', default=False)")
+    raises(ValueError, "BoolOption('6unvalid', 'dummy', default=False)")
+    BoolOption('unvalid6', 'dummy', default=False)
+    BoolOption('unvalid_', 'dummy', default=False)

test/new_api/test_permissive.py

@@ -0,0 +1,258 @@
+# coding: utf-8
+from .autopath import do_autopath
+do_autopath()
+
+from py.test import raises
+
+from tiramisu import IntOption, UnicodeOption, OptionDescription, Config, getapi
+from tiramisu.error import PropertiesOptionError
+
+
+def make_description():
+    u1 = IntOption('u1', '', properties=('frozen', 'mandatory', 'disabled', ))
+    u2 = IntOption('u2', '', properties=('frozen', 'mandatory', 'disabled', ))
+    return OptionDescription('od1', '', [u1, u2])
+
+
+def test_permissive():
+    descr = make_description()
+    api = getapi(Config(descr))
+    api.property.read_write()
+    api.property.read_write()
+    props = frozenset()
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == {'disabled'}
+    api.permissive.set(frozenset(['disabled']))
+    props = frozenset()
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == {'disabled'}
+    api.property.add('permissive')
+    api.option('u1').value.get()
+    api.property.pop('permissive')
+    props = frozenset()
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == {'disabled'}
+
+
+def test_permissive_mandatory():
+    descr = make_description()
+    api = getapi(Config(descr))
+    api.property.read_only()
+    props = frozenset()
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == frozenset(['disabled'])
+    api.permissive.set(frozenset(['mandatory', 'disabled']))
+    api.property.add('permissive')
+    api.option('u1').value.get()
+    api.property.pop('permissive')
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == frozenset(['disabled'])
+
+
+def test_permissive_frozen():
+    descr = make_description()
+    api = getapi(Config(descr))
+    api.property.read_write()
+    api.permissive.set(frozenset(['frozen', 'disabled']))
+    try:
+        api.option('u1').value.set(1)
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == frozenset(['disabled'])
+    api.property.add('permissive')
+    api.option('u1').value.set(1)
+    assert api.option('u1').value.get() == 1
+    api.property.pop('permissive')
+    try:
+        api.option('u1').value.set(1)
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == frozenset(['disabled'])
+
+
+def test_invalid_permissive():
+    descr = make_description()
+    api = getapi(Config(descr))
+    api.property.read_write()
+    raises(TypeError, "api.permissive.set(['frozen', 'disabled'])")
+
+
+def test_permissive_option():
+    descr = make_description()
+    api = getapi(Config(descr))
+    api.property.read_write()
+
+    props = frozenset()
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == {'disabled'}
+    props = frozenset()
+    try:
+        api.option('u2').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == {'disabled'}
+
+    api.option('u1').permissive.set(frozenset(['disabled']))
+    props = frozenset()
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == frozenset()
+    props = frozenset()
+    try:
+        api.option('u2').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == {'disabled'}
+
+    api.property.add('permissive')
+    api.option('u1').value.get()
+    props = frozenset()
+    try:
+        api.option('u2').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == {'disabled'}
+
+    api.property.pop('permissive')
+    props = frozenset()
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == frozenset()
+    props = frozenset()
+    try:
+        api.option('u2').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == {'disabled'}
+
+
+def test_permissive_option_cache():
+    descr = make_description()
+    api = getapi(Config(descr))
+    api.property.read_write()
+
+    props = frozenset()
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == {'disabled'}
+    props = frozenset()
+    try:
+        api.option('u2').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == {'disabled'}
+
+    api.option('u1').permissive.set(frozenset(['disabled']))
+    props = frozenset()
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == frozenset()
+    props = frozenset()
+    try:
+        api.option('u2').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == {'disabled'}
+
+    api.property.add('permissive')
+    api.option('u1').value.get()
+    props = frozenset()
+    try:
+        api.option('u2').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == {'disabled'}
+
+    api.property.pop('permissive')
+    props = frozenset()
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == frozenset()
+    props = frozenset()
+    try:
+        api.option('u2').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == {'disabled'}
+
+
+def test_permissive_option_mandatory():
+    descr = make_description()
+    api = getapi(Config(descr))
+    api.property.read_only()
+    props = frozenset()
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == frozenset(['disabled'])
+    api.option('u1').permissive.set(frozenset(['mandatory', 'disabled']))
+    api.property.add('permissive')
+    api.option('u1').value.get()
+    api.property.pop('permissive')
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert props == frozenset(['disabled'])
+
+
+def test_permissive_option_frozen():
+    descr = make_description()
+    api = getapi(Config(descr))
+    api.property.read_write()
+    api.option('u1').permissive.set(frozenset(['frozen', 'disabled']))
+    api.option('u1').value.set(1)
+    assert api.option('u1').value.get() == 1
+    api.property.add('permissive')
+    assert api.option('u1').value.get() == 1
+    api.property.pop('permissive')
+    assert api.option('u1').value.get() == 1
+
+
+def test_invalid_option_permissive():
+    descr = make_description()
+    api = getapi(Config(descr))
+    api.property.read_write()
+    raises(TypeError, "api.option('u1').permissive.set(['frozen', 'disabled'])")
+
+
+def test_remove_option_permissive():
+    var1 = UnicodeOption('var1', '', u'value', properties=('hidden',))
+    od1 = OptionDescription('od1', '', [var1])
+    rootod = OptionDescription('rootod', '', [od1])
+    api = getapi(Config(rootod))
+    api.property.read_write()
+    raises(PropertiesOptionError, "api.option('od1.var1').value.get()")
+    api.option('od1.var1').permissive.set(frozenset(['hidden']))
+    assert api.option('od1.var1').value.get() == 'value'
+    api.option('od1.var1').permissive.set(frozenset())
+    raises(PropertiesOptionError, "api.option('od1.var1').value.get()")