convert tests

This commit is contained in:
2017-12-13 22:15:34 +01:00
parent fc787d4dbb
commit b5f785d62c
38 changed files with 5234 additions and 566 deletions

View File

@ -349,10 +349,10 @@ class Settings(object):
opt = opt.impl_getopt()
path = opt.impl_getpath(self._getcontext())
meta = self._getcontext().cfgimpl_get_meta()
if meta is None:
return self._pp_.getpermissive(path)
return meta.cfgimpl_get_settings().getpermissive(opt,
path)
if meta is not None:
return meta.cfgimpl_get_settings().getpermissive(opt,
path)
return self._pp_.getpermissive(path)
def apply_requires(self,
opt,
@ -589,6 +589,7 @@ class Settings(object):
opt,
path,
setting_properties,
self_properties=undefined,
index=None,
force_permissive=False):
"""
@ -599,10 +600,11 @@ class Settings(object):
was present
"""
# opt properties
self_properties = self.getproperties(opt,
path,
setting_properties=setting_properties,
index=index)
if self_properties is undefined:
self_properties = self.getproperties(opt,
path,
setting_properties=setting_properties,
index=index)
# calc properties
properties = self_properties & setting_properties - set(['frozen'])
@ -612,7 +614,7 @@ class Settings(object):
value = self._getcontext().cfgimpl_get_values().get_cached_value(opt,
path,
setting_properties,
validate=False,
validate=True,
self_properties=self_properties,
index=index)
if not self.validate_mandatory(opt,
@ -663,6 +665,10 @@ class Settings(object):
force_allow_empty_list=True,
index=index))
def validate_frozen(self,
setting_properties,
self_properties):
return 'everything_frozen' in setting_properties or 'frozen' in self_properties
#____________________________________________________________
# read only/read write