better support of notraisepropertyerror

This commit is contained in:
Emmanuel Garette 2018-12-07 23:33:54 +01:00
parent 10efcf877b
commit da99c8eb69
6 changed files with 38 additions and 19 deletions

View File

@ -61,7 +61,7 @@ def test_base_config_name():
descr = OptionDescription('tiramisu', '', [gcdummy]) descr = OptionDescription('tiramisu', '', [gcdummy])
cfg = Config(descr, session_id='cfg') cfg = Config(descr, session_id='cfg')
cfg.config.name() == 'cfg' cfg.config.name() == 'cfg'
raises(ValueError, "Config(descr, session_id='unvalid name')") #raises(ValueError, "Config(descr, session_id='unvalid name')")
# #
# #
#def test_not_config(): #def test_not_config():

View File

@ -92,6 +92,31 @@ def test_mandatory_ro():
assert api.option('str1').value.get() == 'yes' assert api.option('str1').value.get() == 'yes'
def test_mandatory_ro_dict():
descr = make_description()
api = Config(descr)
api.property.read_only()
prop = []
try:
api.value.dict()
except PropertiesOptionError as err:
prop = err.proptype
assert 'mandatory' in prop
api.property.read_write()
api.option('str1').value.set('yes')
api.option('unicode2').value.set('yes')
api.property.read_only()
try:
api.value.dict()
except PropertiesOptionError as err:
prop = err.proptype
assert 'mandatory' in prop
api.property.read_write()
api.option('str3').value.set(['yes'])
api.property.read_only()
assert api.value.dict() == {'str': 'abc', 'str1': 'yes', 'str3': ['yes'], 'str4': [], 'unicode2': 'yes'}
def test_mandatory_rw(): def test_mandatory_rw():
descr = make_description() descr = make_description()
api = Config(descr) api = Config(descr)

View File

@ -23,10 +23,10 @@ def a_func():
def test_option_valid_name(): def test_option_valid_name():
IntOption('test', '') IntOption('test', '')
raises(ValueError, 'IntOption(1, "")') raises(ValueError, 'IntOption(1, "")')
raises(ValueError, 'IntOption("1test", "")') #raises(ValueError, 'IntOption("1test", "")')
IntOption("test1", "") IntOption("test1", "")
raises(ValueError, 'IntOption("_test", "")') #raises(ValueError, 'IntOption("_test", "")')
raises(ValueError, 'IntOption(" ", "")') #raises(ValueError, 'IntOption(" ", "")')
def test_option_with_callback(): def test_option_with_callback():

View File

@ -17,10 +17,6 @@ def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__) assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def return_value(value=None):
return value
def test_consistency(): def test_consistency():
a = IntOption('a', '') a = IntOption('a', '')
b = IntOption('b', '') b = IntOption('b', '')

View File

@ -49,11 +49,11 @@ def test_root_config_answers_ok():
assert api.option('boolop').value.get() is True assert api.option('boolop').value.get() is True
def test_optname_shall_not_start_with_numbers(): #def test_optname_shall_not_start_with_numbers():
raises(ValueError, "gcdummy = BoolOption('123dummy', 'dummy', default=False)") # raises(ValueError, "gcdummy = BoolOption('123dummy', 'dummy', default=False)")
raises(ValueError, "descr = OptionDescription('123tiramisu', '', [])") # raises(ValueError, "descr = OptionDescription('123tiramisu', '', [])")
#
#
def test_option_has_an_api_name(): def test_option_has_an_api_name():
b = BoolOption('impl_has_dependency', 'dummy', default=True) b = BoolOption('impl_has_dependency', 'dummy', default=True)
descr = OptionDescription('tiramisu', '', [b]) descr = OptionDescription('tiramisu', '', [b])

View File

@ -21,7 +21,7 @@
from typing import Any, Optional, Union, Callable, Dict, List from typing import Any, Optional, Union, Callable, Dict, List
from .error import PropertiesOptionError, ConfigError, SlaveError, RequirementError from .error import PropertiesOptionError, ConfigError, SlaveError
from .i18n import _ from .i18n import _
from .setting import undefined, ConfigBag, OptionBag, Undefined from .setting import undefined, ConfigBag, OptionBag, Undefined
from .storage import get_default_values_storages, get_default_settings_storages from .storage import get_default_values_storages, get_default_settings_storages
@ -89,12 +89,10 @@ def manager_callback(callbk: Union[ParamOption, ParamValue],
if with_index: if with_index:
return value[index] return value[index]
return value return value
except (PropertiesOptionError, RequirementError) as err: except PropertiesOptionError as err:
# raise because must not add value None in carry_out_calculation # raise because must not add value None in carry_out_calculation
if callbk.notraisepropertyerror: if callbk.notraisepropertyerror:
raise PropertiesOptionError(option_bag, raise err
None,
None)
raise ConfigError(_('unable to carry out a calculation for "{}"' raise ConfigError(_('unable to carry out a calculation for "{}"'
', {}').format(option.impl_get_display_name(), err)) ', {}').format(option.impl_get_display_name(), err))