Merge branch 'master' into orm
This commit is contained in:
@ -120,7 +120,7 @@ def test_permissive_option():
|
||||
config.u1
|
||||
except PropertiesOptionError as err:
|
||||
props = err.proptype
|
||||
assert props == ['disabled']
|
||||
assert props == []
|
||||
props = []
|
||||
try:
|
||||
config.u2
|
||||
@ -143,7 +143,7 @@ def test_permissive_option():
|
||||
config.u1
|
||||
except PropertiesOptionError as err:
|
||||
props = err.proptype
|
||||
assert props == ['disabled']
|
||||
assert props == []
|
||||
props = []
|
||||
try:
|
||||
config.u2
|
||||
@ -182,20 +182,12 @@ def test_permissive_option_frozen():
|
||||
setting = config.cfgimpl_get_settings()
|
||||
config.read_write()
|
||||
setting.setpermissive(('frozen', 'disabled'), u1)
|
||||
try:
|
||||
config.u1 = 1
|
||||
except PropertiesOptionError as err:
|
||||
props = err.proptype
|
||||
assert set(props) == set(['frozen', 'disabled'])
|
||||
setting.append('permissive')
|
||||
config.u1 = 1
|
||||
assert config.u1 == 1
|
||||
setting.append('permissive')
|
||||
assert config.u1 == 1
|
||||
setting.remove('permissive')
|
||||
try:
|
||||
config.u1 = 1
|
||||
except PropertiesOptionError as err:
|
||||
props = err.proptype
|
||||
assert set(props) == set(['frozen', 'disabled'])
|
||||
assert config.u1 == 1
|
||||
|
||||
|
||||
def test_invalid_option_permissive():
|
||||
|
Reference in New Issue
Block a user