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

Validation should return exception, not raises exception 

Don't check force_store_value for SymLinkOption
This commit is contained in:
Emmanuel Garette 2016-03-24 19:43:41 +01:00
parent f03a31b454
commit e91568e6b6
5 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/test_freeze.py
View File

@ -7,7 +7,7 @@ from py.test import raises
from tiramisu.setting import owners, groups from tiramisu.setting import owners, groups
from tiramisu.option import ChoiceOption, BoolOption, IntOption, FloatOption, \ from tiramisu.option import ChoiceOption, BoolOption, IntOption, FloatOption, \
StrOption, OptionDescription StrOption, OptionDescription, SymLinkOption
from tiramisu.config import Config from tiramisu.config import Config
from tiramisu.error import PropertiesOptionError, ConfigError from tiramisu.error import PropertiesOptionError, ConfigError
@ -28,13 +28,14 @@ def make_description_freeze():
requires=({'option': booloption, 'expected': True, 'action': 'hidden'},)) requires=({'option': booloption, 'expected': True, 'action': 'hidden'},))
wantref2_option = BoolOption('wantref2', 'Test requires', default=False, properties=('force_store_value', 'hidden')) wantref2_option = BoolOption('wantref2', 'Test requires', default=False, properties=('force_store_value', 'hidden'))
wantref3_option = BoolOption('wantref3', 'Test requires', default=[False], multi=True, properties=('force_store_value',)) wantref3_option = BoolOption('wantref3', 'Test requires', default=[False], multi=True, properties=('force_store_value',))
st2 = SymLinkOption('st2', wantref3_option)
wantframework_option = BoolOption('wantframework', 'Test requires', wantframework_option = BoolOption('wantframework', 'Test requires',
default=False, default=False,
requires=({'option': booloption, 'expected': True, 'action': 'hidden'},)) requires=({'option': booloption, 'expected': True, 'action': 'hidden'},))
gcgroup = OptionDescription('gc', '', [gcoption, gcdummy, floatoption]) gcgroup = OptionDescription('gc', '', [gcoption, gcdummy, floatoption])
descr = OptionDescription('tiramisu', '', [gcgroup, booloption, objspaceoption, descr = OptionDescription('tiramisu', '', [gcgroup, booloption, objspaceoption,
wantref_option, wantref2_option, wantref3_option, stroption, wantref_option, wantref2_option, wantref3_option, st2, stroption,
wantframework_option, wantframework_option,
intoption, boolop]) intoption, boolop])
return descr return descr

3
tiramisu/option/baseoption.py
View File

@ -482,7 +482,8 @@ class Option(OnlyOption):
if _value is None: if _value is None:
return return
# option validation # option validation
err = self._validate(_value, context, current_opt) err = self._validate(_value, context, current_opt,
returns_raise=True)
if err: if err:
log.debug('do_validation: value: {0}, index: {1}, ' log.debug('do_validation: value: {0}, index: {1}, '
'submulti_index: {2}'.format(_value, _index, 'submulti_index: {2}'.format(_value, _index,

61
tiramisu/option/option.py
View File

@ -68,7 +68,8 @@ class ChoiceOption(Option):
properties=properties, properties=properties,
warnings_only=warnings_only) warnings_only=warnings_only)
def impl_get_values(self, context, current_opt=undefined): def impl_get_values(self, context, current_opt=undefined,
returns_raise=False):
if current_opt is undefined: if current_opt is undefined:
current_opt = self current_opt = self
#FIXME cache? but in context... #FIXME cache? but in context...
@ -82,14 +83,21 @@ class ChoiceOption(Option):
values_params = {} values_params = {}
values = carry_out_calculation(current_opt, context=context, values = carry_out_calculation(current_opt, context=context,
callback=values, callback=values,
callback_params=values_params) callback_params=values_params,
returns_raise=returns_raise)
if isinstance(values, Exception):
return values
if values is not undefined and not isinstance(values, list): # pragma: optional cover if values is not undefined and not isinstance(values, list): # pragma: optional cover
raise ConfigError(_('calculated values for {0} is not a list' raise ConfigError(_('calculated values for {0} is not a list'
'').format(self.impl_getname())) '').format(self.impl_getname()))
return values return values
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
values = self.impl_get_values(context, current_opt=current_opt) returns_raise=False):
values = self.impl_get_values(context, current_opt=current_opt,
returns_raise=returns_raise)
if isinstance(values, Exception):
return values
if values is not undefined and not value in values: # pragma: optional cover if values is not undefined and not value in values: # pragma: optional cover
return ValueError(_('value {0} is not permitted, ' return ValueError(_('value {0} is not permitted, '
'only {1} is allowed' 'only {1} is allowed'
@ -101,7 +109,8 @@ class BoolOption(Option):
"represents a choice between ``True`` and ``False``" "represents a choice between ``True`` and ``False``"
__slots__ = tuple() __slots__ = tuple()
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
if not isinstance(value, bool): if not isinstance(value, bool):
return ValueError(_('invalid boolean')) # pragma: optional cover return ValueError(_('invalid boolean')) # pragma: optional cover
@ -110,7 +119,8 @@ class IntOption(Option):
"represents a choice of an integer" "represents a choice of an integer"
__slots__ = tuple() __slots__ = tuple()
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
if not isinstance(value, int): if not isinstance(value, int):
return ValueError(_('invalid integer')) # pragma: optional cover return ValueError(_('invalid integer')) # pragma: optional cover
@ -119,7 +129,8 @@ class FloatOption(Option):
"represents a choice of a floating point number" "represents a choice of a floating point number"
__slots__ = tuple() __slots__ = tuple()
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
if not isinstance(value, float): if not isinstance(value, float):
return ValueError(_('invalid float')) # pragma: optional cover return ValueError(_('invalid float')) # pragma: optional cover
@ -128,7 +139,8 @@ class StrOption(Option):
"represents the choice of a string" "represents the choice of a string"
__slots__ = tuple() __slots__ = tuple()
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
if not isinstance(value, str): if not isinstance(value, str):
return ValueError(_('invalid string')) # pragma: optional cover return ValueError(_('invalid string')) # pragma: optional cover
@ -144,7 +156,8 @@ else:
__slots__ = tuple() __slots__ = tuple()
_empty = u'' _empty = u''
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
if not isinstance(value, unicode): if not isinstance(value, unicode):
return ValueError(_('invalid unicode')) # pragma: optional cover return ValueError(_('invalid unicode')) # pragma: optional cover
@ -172,7 +185,8 @@ class IPOption(Option):
warnings_only=warnings_only, warnings_only=warnings_only,
extra=extra) extra=extra)
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
# sometimes an ip term starts with a zero # sometimes an ip term starts with a zero
# but this does not fit in some case, for example bind does not like it # but this does not fit in some case, for example bind does not like it
err = self._impl_valid_unicode(value) err = self._impl_valid_unicode(value)
@ -276,7 +290,8 @@ class PortOption(Option):
warnings_only=warnings_only, warnings_only=warnings_only,
extra=extra) extra=extra)
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
if isinstance(value, int): if isinstance(value, int):
if sys.version_info[0] >= 3: # pragma: optional cover if sys.version_info[0] >= 3: # pragma: optional cover
value = str(value) value = str(value)
@ -310,7 +325,8 @@ class NetworkOption(Option):
"represents the choice of a network" "represents the choice of a network"
__slots__ = tuple() __slots__ = tuple()
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
err = self._impl_valid_unicode(value) err = self._impl_valid_unicode(value)
if err: if err:
return err return err
@ -333,7 +349,8 @@ class NetmaskOption(Option):
"represents the choice of a netmask" "represents the choice of a netmask"
__slots__ = tuple() __slots__ = tuple()
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
err = self._impl_valid_unicode(value) err = self._impl_valid_unicode(value)
if err: if err:
return err return err
@ -383,7 +400,8 @@ class NetmaskOption(Option):
class BroadcastOption(Option): class BroadcastOption(Option):
__slots__ = tuple() __slots__ = tuple()
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
err = self._impl_valid_unicode(value) err = self._impl_valid_unicode(value)
if err: if err:
return err return err
@ -443,7 +461,8 @@ class DomainnameOption(Option):
warnings_only=warnings_only, warnings_only=warnings_only,
extra=extra) extra=extra)
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
err = self._impl_valid_unicode(value) err = self._impl_valid_unicode(value)
if err: if err:
return err return err
@ -504,7 +523,8 @@ class EmailOption(DomainnameOption):
__slots__ = tuple() __slots__ = tuple()
username_re = re.compile(r"^[\w!#$%&'*+\-/=?^`{|}~.]+$") username_re = re.compile(r"^[\w!#$%&'*+\-/=?^`{|}~.]+$")
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
err = self._impl_valid_unicode(value) err = self._impl_valid_unicode(value)
if err: if err:
return err return err
@ -528,7 +548,8 @@ class URLOption(DomainnameOption):
proto_re = re.compile(r'(http|https)://') proto_re = re.compile(r'(http|https)://')
path_re = re.compile(r"^[A-Za-z0-9\-\._~:/\?#\[\]@!%\$&\'\(\)\*\+,;=]+$") path_re = re.compile(r"^[A-Za-z0-9\-\._~:/\?#\[\]@!%\$&\'\(\)\*\+,;=]+$")
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
err = self._impl_valid_unicode(value) err = self._impl_valid_unicode(value)
if err: if err:
return err return err
@ -574,7 +595,8 @@ class UsernameOption(Option):
#regexp build with 'man 8 adduser' informations #regexp build with 'man 8 adduser' informations
username_re = re.compile(r"^[a-z_][a-z0-9_-]{0,30}[$a-z0-9_-]{0,1}$") username_re = re.compile(r"^[a-z_][a-z0-9_-]{0,30}[$a-z0-9_-]{0,1}$")
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
err = self._impl_valid_unicode(value) err = self._impl_valid_unicode(value)
if err: if err:
return err return err
@ -587,7 +609,8 @@ class FilenameOption(Option):
__slots__ = tuple() __slots__ = tuple()
path_re = re.compile(r"^[a-zA-Z0-9\-\._~/+]+$") path_re = re.compile(r"^[a-zA-Z0-9\-\._~/+]+$")
def _validate(self, value, context=undefined, current_opt=undefined): def _validate(self, value, context=undefined, current_opt=undefined,
returns_raise=False):
err = self._impl_valid_unicode(value) err = self._impl_valid_unicode(value)
if err: if err:
return err return err

2
tiramisu/option/optiondescription.py
View File

@ -124,7 +124,7 @@ class OptionDescription(BaseOption, StorageOptionDescription):
else: else:
option._set_readonly(True) option._set_readonly(True)
is_multi = option.impl_is_multi() is_multi = option.impl_is_multi()
if 'force_store_value' in option.impl_getproperties(): if not isinstance(option, SymLinkOption) and 'force_store_value' in option.impl_getproperties():
force_store_values.append((subpath, option)) force_store_values.append((subpath, option))
for func, all_cons_opts, params in option._get_consistencies(): for func, all_cons_opts, params in option._get_consistencies():
option._valid_consistencies(all_cons_opts[1:]) option._valid_consistencies(all_cons_opts[1:])

2
tiramisu/storage/dictionary/option.py
View File

@ -97,7 +97,7 @@ class StorageBase(object):
_setattr(self, '_default', default) _setattr(self, '_default', default)
if is_multi and default_multi is not None: if is_multi and default_multi is not None:
err = self._validate(default_multi) err = self._validate(default_multi, returns_raise=True)
if err: if err:
raise ValueError(_("invalid default_multi value {0} " raise ValueError(_("invalid default_multi value {0} "
"for option {1}: {2}").format( "for option {1}: {2}").format(