do same api for property and permissive

test/test_masterslaves.py

@@ -191,7 +191,7 @@ def test_iter_on_empty_group():
 def test_iter_not_group():
     api = Config(OptionDescription("name", "descr", []))
     api.property.read_write()
-    raises(TypeError, "list(api.option.list(type='optiondescription', group_type='family'))")
+    raises(AssertionError, "list(api.option.list(type='optiondescription', group_type='family'))")
 
 
 def test_groups_with_master():

test/test_option.py

@@ -140,7 +140,8 @@ def test_optiondescription_list():
     assert len(list(api.option('od').list('optiondescription', group_type=groups.notfamily1))) == 1
     assert len(list(api.option('od.od').list('option'))) == 1
     assert len(list(api.option('od.od2').list('option'))) == 1
-    raises(APIError, "list(api.option.list('unknown'))")
+    raises(AssertionError, "list(api.option('od').list('unknown'))")
+    raises(AssertionError, "list(api.option('od').list('option', group_type='toto'))")
 
 
 def test_optiondescription_group():
@@ -157,7 +158,8 @@ def test_optiondescription_group():
     assert len(list(api.option.list('optiondescription'))) == 2
     assert len(list(api.option.list('optiondescription', group_type=groups.family))) == 1
     assert len(list(api.option.list('optiondescription', group_type=groups.notfamily))) == 1
-    raises(APIError, "list(api.option.list('unknown'))")
+    raises(AssertionError, "list(api.option.list('unknown'))")
+    raises(AssertionError, "list(api.option.list('option', group_type='toto'))")
 
 
 def test_optiondescription_group_redefined():

test/test_option_setting.py

@@ -421,16 +421,6 @@ def test_reset_properties():
     assert api.option('gc.dummy').property.get() == set()
 
 
-def test_reset_properties_all():
-    descr = make_description()
-    api = Config(descr)
-    assert api.option('gc.dummy').property.get() == set()
-    api.option('gc.dummy').property.add('frozen')
-    assert api.option('gc.dummy').property.get() == {'frozen'}
-    api.property.reset(all=True)
-    assert api.option('gc.dummy').property.get() == set()
-
-
 def test_properties_cached():
     b1 = BoolOption("b1", "", properties=('test',))
     descr = OptionDescription("opt", "", [OptionDescription("sub", "", [b1])])

test/test_permissive.py

@@ -45,6 +45,72 @@ def test_permissive():
     assert set(props) == {'disabled'}
 
 
+def test_permissive_add():
+    descr = make_description()
+    api = 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 set(props) == {'disabled'}
+    api.unrestraint.permissive.add('disabled')
+    assert api.unrestraint.permissive.get() == frozenset(['hidden', 'disabled'])
+    props = frozenset()
+    try:
+        api.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert set(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 set(props) == {'disabled'}
+
+
+def test_permissive_pop():
+    descr = make_description()
+    api = Config(descr)
+    api.property.read_write()
+    api.property.read_write()
+    props = frozenset()
+    try:
+        api.forcepermissive.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert set(props) == {'disabled'}
+    api.unrestraint.permissive.add('disabled')
+    assert api.unrestraint.permissive.get() == frozenset(['hidden', 'disabled'])
+    api.forcepermissive.option('u1').value.get()
+    api.unrestraint.permissive.pop('disabled')
+    props = frozenset()
+    try:
+        api.forcepermissive.option('u1').value.get()
+    except PropertiesOptionError as err:
+        props = err.proptype
+    assert set(props) == {'disabled'}
+
+
+def test_permissive_reset():
+    descr = make_description()
+    api = Config(descr)
+    api.property.read_write()
+    assert api.unrestraint.permissive.get() == frozenset(['hidden'])
+    #
+    api.unrestraint.permissive.set(frozenset(['disabled']))
+    assert api.unrestraint.permissive.get() == frozenset(['disabled'])
+    #
+    api.unrestraint.permissive.reset()
+    assert api.unrestraint.permissive.get() == frozenset()
+
+
 def test_permissive_mandatory():
     descr = make_description()
     api = Config(descr)
@@ -290,3 +356,18 @@ def test_remove_option_permissive():
     api.forcepermissive.option('od1.var1').permissive.set(frozenset())
     assert api.forcepermissive.option('od1.var1').permissive.get() == frozenset()
     raises(PropertiesOptionError, "api.option('od1.var1').value.get()")
+
+
+def test_reset_option_permissive():
+    var1 = UnicodeOption('var1', '', u'value', properties=('hidden',))
+    od1 = OptionDescription('od1', '', [var1])
+    rootod = OptionDescription('rootod', '', [od1])
+    api = Config(rootod)
+    api.property.read_write()
+    raises(PropertiesOptionError, "api.option('od1.var1').value.get()")
+    api.forcepermissive.option('od1.var1').permissive.set(frozenset(['hidden']))
+    assert api.forcepermissive.option('od1.var1').permissive.get() == frozenset(['hidden'])
+    assert api.option('od1.var1').value.get() == 'value'
+    api.forcepermissive.option('od1.var1').permissive.reset()
+    assert api.forcepermissive.option('od1.var1').permissive.get() == frozenset()
+    raises(PropertiesOptionError, "api.option('od1.var1').value.get()")

test/test_symlink.py

@@ -60,7 +60,7 @@ def test_symlink_addproperties():
     api = Config(descr)
     api.property.read_write()
     raises(TypeError, "api.option('c').property.add('new')")
-    raises(TypeError, "api.option('c').property.reset()")
+    raises(AssertionError, "api.option('c').property.reset()")
 
 
 def test_symlink_getpermissive():
@@ -80,7 +80,7 @@ def test_symlink_addpermissive():
     api = Config(descr)
     api.property.read_write()
     raises(TypeError, "api.option('c').permissive.set(frozenset(['new']))")
-    raises(TypeError, "api.option('c').permissive.reset()")
+    raises(AssertionError, "api.option('c').permissive.reset()")
 
 
 def test_symlink_getproperties():