adapt tests
This commit is contained in:
@ -188,11 +188,6 @@ class TiramisuOptionOption(CommonTiramisuOption):
|
||||
option = self._get_option()
|
||||
return option.impl_is_master_slaves('slave')
|
||||
|
||||
@count
|
||||
def name(self):
|
||||
option = self._get_option()
|
||||
return option.impl_getname()
|
||||
|
||||
@count
|
||||
def doc(self):
|
||||
option = self._get_option()
|
||||
@ -766,8 +761,12 @@ class TiramisuContextConfig(TiramisuContext):
|
||||
|
||||
class TiramisuDispatcherConfig(TiramisuContextConfig):
|
||||
def __call__(self, path):
|
||||
spaths = path.split('.')
|
||||
config = self.config_bag.config
|
||||
if path is None:
|
||||
return TiramisuAPI(config,
|
||||
force_permissive=self.config_bag.force_permissive,
|
||||
force_unrestraint=self.config_bag.force_unrestraint)
|
||||
spaths = path.split('.')
|
||||
for spath in spaths:
|
||||
config = config.getconfig(spath)
|
||||
return TiramisuAPI(config,
|
||||
|
@ -97,11 +97,11 @@ class Option(OnlyOption):
|
||||
_setattr(self, '_multi', _multi)
|
||||
if multi is not False and default is None:
|
||||
default = []
|
||||
super(Option, self).__init__(name,
|
||||
doc,
|
||||
requires=requires,
|
||||
properties=properties,
|
||||
is_multi=is_multi)
|
||||
super().__init__(name,
|
||||
doc,
|
||||
requires=requires,
|
||||
properties=properties,
|
||||
is_multi=is_multi)
|
||||
if validator is not None:
|
||||
validate_calculator(validator,
|
||||
validator_params,
|
||||
@ -343,6 +343,7 @@ class Option(OnlyOption):
|
||||
warnings.warn_explicit(ValueWarning(msg, self),
|
||||
ValueWarning,
|
||||
self.__class__.__name__, 0)
|
||||
|
||||
|
||||
def impl_is_dynsymlinkoption(self):
|
||||
return False
|
||||
|
@ -567,6 +567,7 @@ class Settings(object):
|
||||
if self._getcontext().cfgimpl_get_meta() is not None:
|
||||
raise ConfigError(_('cannot change property with metaconfig'))
|
||||
if path is not None and config_bag.option.impl_getrequires() is not None:
|
||||
print(properties, getattr(config_bag.option, '_calc_properties', static_set))
|
||||
not_allowed_props = properties & getattr(config_bag.option, '_calc_properties', static_set)
|
||||
if not_allowed_props:
|
||||
if len(not_allowed_props) == 1:
|
||||
@ -575,9 +576,9 @@ class Settings(object):
|
||||
else:
|
||||
prop_msg = _('properties')
|
||||
calc_msg = _('those properties are calculated')
|
||||
raise ValueError(_('cannot set {} {} for option {} {}'
|
||||
raise ValueError(_('cannot set {} {} for option "{}" {}'
|
||||
'').format(prop_msg, display_list(list(not_allowed_props), add_quote=True),
|
||||
config_bag.option.impl_getname(),
|
||||
config_bag.option.impl_get_display_name(),
|
||||
calc_msg))
|
||||
if config_bag is None:
|
||||
opt = None
|
||||
@ -607,9 +608,17 @@ class Settings(object):
|
||||
raise ConfigError(_('cannot add this property: "{0}"').format(
|
||||
' '.join(property_)))
|
||||
|
||||
props = config_bag.option.impl_getproperties()
|
||||
print('add', property_)
|
||||
self_properties = config_bag.properties
|
||||
if self_properties is None:
|
||||
index = None
|
||||
self_properties = self.getproperties(path,
|
||||
index,
|
||||
config_bag,
|
||||
apply_requires=False)
|
||||
config_bag.properties = self_properties
|
||||
self.setproperties(path,
|
||||
props | {property_},
|
||||
self_properties | {property_},
|
||||
config_bag,
|
||||
force=True)
|
||||
|
||||
@ -617,9 +626,16 @@ class Settings(object):
|
||||
path,
|
||||
property_,
|
||||
config_bag):
|
||||
props = config_bag.option.impl_getproperties()
|
||||
self_properties = config_bag.properties
|
||||
if self_properties is None:
|
||||
index = None
|
||||
self_properties = self.getproperties(path,
|
||||
index,
|
||||
config_bag,
|
||||
apply_requires=False)
|
||||
config_bag.properties = self_properties
|
||||
self.setproperties(path,
|
||||
props - {property_},
|
||||
self_properties - {property_},
|
||||
config_bag,
|
||||
force=True)
|
||||
|
||||
|
Reference in New Issue
Block a user