Infra
/
tiramisu
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ValueError if not PropertieError

This commit is contained in:
Emmanuel Garette 2015-04-18 23:46:37 +02:00
parent d959020eed
commit 057bba83e4
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -3,6 +3,8 @@ Sat Apr 18 22:42:53 2015 +0200 Emmanuel Garette <egarette@cadoles.com>
Settings) to validate value with those object. Now value with Settings) to validate value with those object. Now value with
callback and consistency are correctly validate callback and consistency are correctly validate
* ability to disable warnings validation * ability to disable warnings validation
* if ValueError and PropertieError together, should raise with
PropertieError
Sun Mar 8 12:02:17 2015 +0200 Emmanuel Garette <egarette@cadoles.com> Sun Mar 8 12:02:17 2015 +0200 Emmanuel Garette <egarette@cadoles.com>
* valid default/callback value in consistencies * valid default/callback value in consistencies

14
test/test_option_calculation.py
View File

@ -843,6 +843,20 @@ def test_callback_two_disabled2():
assert cfg.getowner(opt2, force_permissive=True) == owners.default assert cfg.getowner(opt2, force_permissive=True) == owners.default
def test_callback_calculating_invalid():
opt1 = IntOption('opt1', '', 1)
opt2 = BoolOption('opt2', '', callback=return_value, callback_params={'': ((opt1, False),)})
od1 = OptionDescription('od1', '', [opt1])
od2 = OptionDescription('od2', '', [opt2])
maconfig = OptionDescription('rootconfig', '', [od1, od2])
cfg = Config(maconfig)
setting = cfg.cfgimpl_get_settings()
cfg.read_write()
raises(ValueError, 'cfg.od2.opt2')
setting[opt2].append('disabled')
raises(PropertiesOptionError, 'cfg.od2.opt2')
def test_callback_calculating_disabled(): def test_callback_calculating_disabled():
opt1 = BoolOption('opt1', '', properties=('disabled',)) opt1 = BoolOption('opt1', '', properties=('disabled',))
opt2 = BoolOption('opt2', '', callback=return_value, callback_params={'': ((opt1, False),)}) opt2 = BoolOption('opt2', '', callback=return_value, callback_params={'': ((opt1, False),)})

5
tiramisu/value.py
View File

@ -300,10 +300,15 @@ class Values(object):
force_submulti_index = submulti_index force_submulti_index = submulti_index
if setting_properties is undefined: if setting_properties is undefined:
setting_properties = setting._getproperties() setting_properties = setting._getproperties()
try:
opt.impl_validate(value, context, opt.impl_validate(value, context,
'validator' in setting_properties, 'validator' in setting_properties,
force_index=force_index, force_index=force_index,
force_submulti_index=force_submulti_index) force_submulti_index=force_submulti_index)
except ValueError, err:
config_error = err
value = None
#FIXME pas de test avec les metas ... #FIXME pas de test avec les metas ...
#FIXME et les symlinkoption ... #FIXME et les symlinkoption ...
if is_default and 'force_store_value' in setting._getitem(opt, if is_default and 'force_store_value' in setting._getitem(opt,