add test for master/slave and callback
This commit is contained in:
@ -10,6 +10,7 @@ from tiramisu import Config, MetaConfig, \
|
||||
StrOption, OptionDescription, MasterSlaves, DynOptionDescription, \
|
||||
getapi, submulti, undefined, owners
|
||||
from tiramisu.error import PropertiesOptionError, APIError, ConfigError
|
||||
from tiramisu.api import display_count
|
||||
from collections import OrderedDict
|
||||
ICON = u'\u2937'
|
||||
|
||||
@ -45,6 +46,10 @@ def return_list(val=None, suffix=None):
|
||||
return ['val1', 'val2']
|
||||
|
||||
|
||||
def return_str(val, suffix=None):
|
||||
return val
|
||||
|
||||
|
||||
def display_info(func):
|
||||
def wrapper(*args, **kwargs):
|
||||
if DISPLAY:
|
||||
@ -151,8 +156,8 @@ def autocheck_default_owner(api, path, confread, confwrite, **kwargs):
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 0).owner.get()")
|
||||
assert api.forcepermissive.config(conf).option(path, 0).owner.get() == 'default'
|
||||
#
|
||||
assert api.config(conf).option(path, 0).owner.isdefault()
|
||||
raises(PropertiesOptionError, "api.forcepermissive.config(conf).option(path, 0).owner.isdefault()")
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 0).owner.isdefault()")
|
||||
assert api.forcepermissive.config(conf).option(path, 0).owner.isdefault()
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 0).owner.get()")
|
||||
raises(PropertiesOptionError, "api.forcepermissive.config(conf).option(path, 0).owner.get()")
|
||||
@ -168,13 +173,6 @@ def autocheck_default_owner(api, path, confread, confwrite, **kwargs):
|
||||
do(confwrite)
|
||||
|
||||
|
||||
def _getdefault(api, path, multi, isslave, submulti_):
|
||||
empty_value = api.unrestraint.option(path).option.getdefault()
|
||||
if isslave and empty_value == []:
|
||||
empty_value = api.unrestraint.option(path).option.getdefaultmulti()
|
||||
return empty_value
|
||||
|
||||
|
||||
def _autocheck_default_value(api, path, conf, **kwargs):
|
||||
"""set and get values
|
||||
"""
|
||||
@ -184,7 +182,7 @@ def _autocheck_default_value(api, path, conf, **kwargs):
|
||||
isslave = api.unrestraint.option(path).option.isslave()
|
||||
|
||||
# set default value (different if value is multi or not)
|
||||
empty_value = _getdefault(api, path, multi, isslave, submulti_)
|
||||
empty_value = kwargs['default']
|
||||
|
||||
# test default value (should be empty)
|
||||
# cannot test for slave (we cannot get all values for a slave)
|
||||
@ -221,7 +219,7 @@ def autocheck_default_value(api, path, confread, confwrite, **kwargs):
|
||||
|
||||
|
||||
|
||||
def _autocheck_set_value(api, path, conf, **kwargs):
|
||||
def _set_value(api, path, conf, **kwargs):
|
||||
set_permissive = kwargs.get('set_permissive', True)
|
||||
multi = api.unrestraint.option(path).option.ismulti()
|
||||
submulti_ = api.unrestraint.option(path).option.issubmulti()
|
||||
@ -230,9 +228,16 @@ def _autocheck_set_value(api, path, conf, **kwargs):
|
||||
if not multi:
|
||||
first_value = FIRST_VALUE
|
||||
elif submulti_ is False:
|
||||
first_value = LIST_FIRST_VALUE
|
||||
if not isslave:
|
||||
first_value = LIST_FIRST_VALUE
|
||||
else:
|
||||
second_value = LIST_SECOND_VALUE[1]
|
||||
|
||||
else:
|
||||
first_value = SUBLIST_FIRST_VALUE
|
||||
if not isslave:
|
||||
first_value = SUBLIST_FIRST_VALUE
|
||||
else:
|
||||
second_value = SUBLIST_SECOND_VALUE[1]
|
||||
|
||||
# for slave should have an index and good length
|
||||
# for master must append, not set
|
||||
@ -255,19 +260,19 @@ def _autocheck_set_value(api, path, conf, **kwargs):
|
||||
elif isslave:
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
if not set_permissive:
|
||||
api.config(conf).option(path, 0).value.set(first_value[0])
|
||||
api.config(conf).option(path, 1).value.set(second_value)
|
||||
else:
|
||||
api.forcepermissive.config(conf).option(path, 0).value.set(first_value[0])
|
||||
api.forcepermissive.config(conf).option(path, 1).value.set(second_value)
|
||||
elif not kwargs.get('propertyerror', False):
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 0).value.set(first_value[0])")
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 1).value.set(second_value)")
|
||||
if set_permissive:
|
||||
api.forcepermissive.config(conf).option(path, 0).value.set(first_value[0])
|
||||
api.forcepermissive.config(conf).option(path, 1).value.set(second_value)
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 0).value.set(first_value[0])")
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 1).value.set(second_value)")
|
||||
raises(PropertiesOptionError,
|
||||
"api.forcepermissive.config(conf).option(path, 0).value.set(first_value[0])")
|
||||
"api.forcepermissive.config(conf).option(path, 1).value.set(second_value)")
|
||||
raises(APIError,
|
||||
"api.unrestraint.config(conf).option(path).value.set([first_value[0], first_value[1]])")
|
||||
"api.unrestraint.config(conf).option(path).value.set([second_value, second_value])")
|
||||
|
||||
else:
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
@ -287,7 +292,7 @@ def _autocheck_set_value(api, path, conf, **kwargs):
|
||||
|
||||
@autocheck
|
||||
def autocheck_set_value(api, path, confread, confwrite, **kwargs):
|
||||
_autocheck_set_value(api, path, confwrite, **kwargs)
|
||||
_set_value(api, path, confwrite, **kwargs)
|
||||
|
||||
|
||||
@autocheck
|
||||
@ -295,7 +300,8 @@ def autocheck_get_value_permissive(api, path, confread, confwrite, **kwargs):
|
||||
multi = api.unrestraint.option(path).option.ismulti()
|
||||
submulti_ = api.unrestraint.option(path).option.issubmulti()
|
||||
isslave = api.unrestraint.option(path).option.isslave()
|
||||
_autocheck_set_value(api, path, confwrite, **kwargs)
|
||||
_set_value(api, path, confwrite, **kwargs)
|
||||
empty_value = kwargs['default']
|
||||
if not multi:
|
||||
first_value = FIRST_VALUE
|
||||
elif submulti_ is False:
|
||||
@ -307,14 +313,27 @@ def autocheck_get_value_permissive(api, path, confread, confwrite, **kwargs):
|
||||
# get value after set value without permissive
|
||||
if isslave:
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
assert api.config(conf).option(path, 0).value.get() == first_value[0]
|
||||
assert api.forcepermissive.config(conf).option(path, 0).value.get() == first_value[0]
|
||||
assert api.config(conf).option(path, 0).value.get() == empty_value
|
||||
assert api.forcepermissive.config(conf).option(path, 0).value.get() == empty_value
|
||||
if submulti_:
|
||||
assert api.config(conf).option(path, 1).value.get() == SUBLIST_SECOND_VALUE[1]
|
||||
assert api.forcepermissive.config(conf).option(path, 1).value.get() == SUBLIST_SECOND_VALUE[1]
|
||||
else:
|
||||
assert api.config(conf).option(path, 1).value.get() == LIST_SECOND_VALUE[1]
|
||||
assert api.forcepermissive.config(conf).option(path, 1).value.get() == LIST_SECOND_VALUE[1]
|
||||
elif kwargs.get('permissive', False):
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 0).value.get()")
|
||||
assert api.forcepermissive.config(conf).option(path, 0).value.get() == first_value
|
||||
raises(PropertiesOptionError, "assert api.config(conf).option(path, 0).value.get()")
|
||||
raises(PropertiesOptionError, "assert api.config(conf).option(path, 1).value.get()")
|
||||
assert api.forcepermissive.config(conf).option(path, 0).value.get() == empty_value
|
||||
if submulti_:
|
||||
assert api.forcepermissive.config(conf).option(path, 1).value.get() == SUBLIST_SECOND_VALUE[1]
|
||||
else:
|
||||
assert api.forcepermissive.config(conf).option(path, 1).value.get() == LIST_SECOND_VALUE[1]
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 0).value.get()")
|
||||
raises(PropertiesOptionError, "api.forcepermissive.config(conf).option(path, 0).value.get()")
|
||||
raises(PropertiesOptionError, "assert api.config(conf).option(path, 0).value.get()")
|
||||
raises(PropertiesOptionError, "assert api.config(conf).option(path, 1).value.get()")
|
||||
raises(PropertiesOptionError, "assert api.forcepermissive.config(conf).option(path, 0).value.get()")
|
||||
raises(PropertiesOptionError, "assert api.forcepermissive.config(conf).option(path, 1).value.get()")
|
||||
else:
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
assert api.config(conf).option(path).value.get() == first_value
|
||||
@ -331,25 +350,39 @@ def autocheck_get_value_permissive(api, path, confread, confwrite, **kwargs):
|
||||
|
||||
|
||||
def _autocheck_get_value(api, path, conf, **kwargs):
|
||||
set_permissive = kwargs.get('set_permissive', True)
|
||||
multi = api.unrestraint.option(path).option.ismulti()
|
||||
submulti_ = api.unrestraint.option(path).option.issubmulti()
|
||||
isslave = api.unrestraint.option(path).option.isslave()
|
||||
empty_value = _getdefault(api, path, multi, isslave, submulti_)
|
||||
empty_value = kwargs['default']
|
||||
if not multi:
|
||||
first_value = FIRST_VALUE
|
||||
elif submulti_ is False:
|
||||
first_value = LIST_FIRST_VALUE
|
||||
if not isslave:
|
||||
first_value = LIST_FIRST_VALUE
|
||||
else:
|
||||
second_value = LIST_SECOND_VALUE[1]
|
||||
|
||||
else:
|
||||
first_value = SUBLIST_FIRST_VALUE
|
||||
if not isslave:
|
||||
first_value = SUBLIST_FIRST_VALUE
|
||||
else:
|
||||
second_value = SUBLIST_SECOND_VALUE[1]
|
||||
|
||||
# get value after set value without permissive
|
||||
if isslave:
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
assert api.config(conf).option(path, 0).value.get() == first_value[0]
|
||||
assert api.forcepermissive.config(conf).option(path, 0).value.get() == first_value[0]
|
||||
assert api.config(conf).option(path, 0).value.get() == empty_value
|
||||
assert api.config(conf).option(path, 1).value.get() == second_value
|
||||
assert api.forcepermissive.config(conf).option(path, 0).value.get() == empty_value
|
||||
assert api.forcepermissive.config(conf).option(path, 1).value.get() == second_value
|
||||
elif kwargs.get('permissive', False):
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 0).value.get()")
|
||||
assert api.forcepermissive.config(conf).option(path, 0).value.get() == empty_value
|
||||
if set_permissive:
|
||||
assert api.forcepermissive.config(conf).option(path, 1).value.get() == second_value
|
||||
else:
|
||||
assert api.forcepermissive.config(conf).option(path, 1).value.get() == empty_value
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 0).value.get()")
|
||||
raises(PropertiesOptionError, "api.forcepermissive.config(conf).option(path, 0).value.get()")
|
||||
@ -359,7 +392,10 @@ def _autocheck_get_value(api, path, conf, **kwargs):
|
||||
assert api.forcepermissive.config(conf).option(path).value.get() == first_value
|
||||
elif kwargs.get('permissive', False):
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path).value.get()")
|
||||
assert api.forcepermissive.config(conf).option(path).value.get() == empty_value
|
||||
if set_permissive:
|
||||
assert api.forcepermissive.config(conf).option(path).value.get() == first_value
|
||||
else:
|
||||
assert api.forcepermissive.config(conf).option(path).value.get() == empty_value
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path).value.get()")
|
||||
raises(PropertiesOptionError, "api.forcepermissive.config(conf).option(path).value.get()")
|
||||
@ -367,10 +403,10 @@ def _autocheck_get_value(api, path, conf, **kwargs):
|
||||
|
||||
@autocheck
|
||||
def autocheck_get_value(api, path, confread, confwrite, **kwargs):
|
||||
_autocheck_set_value(api, path, confwrite, set_permissive=False, **kwargs)
|
||||
_autocheck_get_value(api, path, confread, **kwargs)
|
||||
_set_value(api, path, confwrite, set_permissive=False, **kwargs)
|
||||
_autocheck_get_value(api, path, confread, set_permissive=False, **kwargs)
|
||||
if confread != confwrite:
|
||||
_autocheck_get_value(api, path, confwrite, **kwargs)
|
||||
_autocheck_get_value(api, path, confwrite, set_permissive=False, **kwargs)
|
||||
|
||||
|
||||
@autocheck
|
||||
@ -386,11 +422,7 @@ def autocheck_value_slave(api, path, confread, confwrite, **kwargs):
|
||||
|
||||
multi = api.unrestraint.option(path).option.ismulti()
|
||||
submulti_ = api.forcepermissive.option(path).option.issubmulti()
|
||||
if not submulti_:
|
||||
second_value = LIST_SECOND_VALUE
|
||||
else:
|
||||
second_value = SUBLIST_SECOND_VALUE
|
||||
empty_value = _getdefault(api, path, multi, isslave, submulti_)
|
||||
empty_value = kwargs['default']
|
||||
|
||||
def do(conf):
|
||||
if not kwargs.get('permissive', False):
|
||||
@ -409,7 +441,7 @@ def autocheck_value_slave(api, path, confread, confwrite, **kwargs):
|
||||
for idx in range(length):
|
||||
value.append(api.forcepermissive.option(path, idx).value.get())
|
||||
|
||||
assert value == [empty_value, second_value[1]]
|
||||
assert value == [empty_value, empty_value]
|
||||
# cannot access to a slave with index too high
|
||||
if submulti_ is False:
|
||||
value = LIST_FIRST_VALUE[0]
|
||||
@ -443,8 +475,8 @@ def autocheck_reset_value(api, path, confread, confwrite, **kwargs):
|
||||
else:
|
||||
first_value = SUBLIST_FIRST_VALUE
|
||||
second_value = SUBLIST_SECOND_VALUE
|
||||
empty_value = _getdefault(api, path, multi, isslave, submulti_)
|
||||
_autocheck_set_value(api, path, confwrite, **kwargs)
|
||||
empty_value = kwargs['default']
|
||||
_set_value(api, path, confwrite, **kwargs)
|
||||
|
||||
# reset value without permissive
|
||||
if not isslave:
|
||||
@ -479,11 +511,88 @@ def autocheck_reset_value(api, path, confread, confwrite, **kwargs):
|
||||
do(confwrite)
|
||||
|
||||
|
||||
@autocheck
|
||||
def autocheck_append_value(api, path, confread, confwrite, **kwargs):
|
||||
ismaster = api.unrestraint.option(path).option.ismaster()
|
||||
submulti_ = api.unrestraint.option(path).option.issubmulti()
|
||||
if not ismaster:
|
||||
return
|
||||
|
||||
if not kwargs.get('propertyerror', False):
|
||||
master_value = api.forcepermissive.config(confread).option(path).value.get()
|
||||
len_value = len(master_value)
|
||||
master_value.append(undefined)
|
||||
assert len(api.forcepermissive.config(confread).option(path).value.get()) == len_value
|
||||
api.forcepermissive.config(confwrite).option(path).value.set(master_value)
|
||||
new_master_value = api.forcepermissive.config(confread).option(path).value.get()
|
||||
len_new = len(new_master_value)
|
||||
assert len_value + 1 == len_new
|
||||
assert new_master_value[-1] == kwargs['default_multi']
|
||||
slave_path = path.rsplit('.', 1)[0] + '.third'
|
||||
for idx in range(len_new):
|
||||
assert api.forcepermissive.config(confread).option(slave_path, idx).value.get() == kwargs['default_multi']
|
||||
#
|
||||
if not submulti_:
|
||||
value = 'value'
|
||||
else:
|
||||
value = ['value']
|
||||
master_value.append(value)
|
||||
assert len(api.forcepermissive.config(confread).option(path).value.get()) == len(new_master_value)
|
||||
api.forcepermissive.config(confwrite).option(path).value.set(master_value)
|
||||
assert api.forcepermissive.config(confread).option(path).value.get()[-1] == value
|
||||
|
||||
|
||||
@autocheck
|
||||
def autocheck_pop_value(api, path, confread, confwrite, **kwargs):
|
||||
ismaster = api.unrestraint.option(path).option.ismaster()
|
||||
submulti_ = api.unrestraint.option(path).option.issubmulti()
|
||||
if not ismaster:
|
||||
return
|
||||
|
||||
if not kwargs.get('propertyerror', False):
|
||||
if not submulti_:
|
||||
values = ['value1', 'value2', 'value3', 'value4']
|
||||
slave = 'slave'
|
||||
else:
|
||||
values = [['value1'], ['value2'], ['value3'], ['value4']]
|
||||
slave = ['slave']
|
||||
slaves = [kwargs['default_multi'], slave, kwargs['default_multi'], kwargs['default_multi']]
|
||||
a_slave = path.rsplit('.', 1)[0] + '.third'
|
||||
api.forcepermissive.config(confwrite).option(path).value.set(values)
|
||||
api.forcepermissive.config(confwrite).option(a_slave, 1).value.set(slave)
|
||||
api.forcepermissive.config(confread).option(a_slave, 0).value.get() == kwargs['default_multi']
|
||||
assert api.forcepermissive.config(confread).option(a_slave, 0).owner.isdefault() is True
|
||||
api.forcepermissive.config(confread).option(a_slave, 1).value.get() == slave
|
||||
assert api.forcepermissive.config(confread).option(a_slave, 1).owner.isdefault() is False
|
||||
api.forcepermissive.config(confread).option(a_slave, 2).value.get() == kwargs['default_multi']
|
||||
assert api.forcepermissive.config(confread).option(a_slave, 2).owner.isdefault() is True
|
||||
api.forcepermissive.config(confread).option(a_slave, 3).value.get() == kwargs['default_multi']
|
||||
assert api.forcepermissive.config(confread).option(a_slave, 3).owner.isdefault() is True
|
||||
#
|
||||
api.forcepermissive.config(confwrite).option(path).value.pop(3)
|
||||
api.forcepermissive.config(confread).option(a_slave, 0).value.get() == kwargs['default_multi']
|
||||
assert api.forcepermissive.config(confread).option(a_slave, 0).owner.isdefault() is True
|
||||
api.forcepermissive.config(confread).option(a_slave, 1).value.get() == slave
|
||||
assert api.forcepermissive.config(confread).option(a_slave, 1).owner.isdefault() is False
|
||||
api.forcepermissive.config(confread).option(a_slave, 2).value.get() == kwargs['default_multi']
|
||||
assert api.forcepermissive.config(confread).option(a_slave, 2).owner.isdefault() is True
|
||||
#
|
||||
api.forcepermissive.config(confwrite).option(path).value.pop(0)
|
||||
api.forcepermissive.config(confread).option(a_slave, 0).value.get() == slave
|
||||
assert api.forcepermissive.config(confread).option(a_slave, 0).owner.isdefault() is False
|
||||
api.forcepermissive.config(confread).option(a_slave, 1).value.get() == kwargs['default_multi']
|
||||
assert api.forcepermissive.config(confread).option(a_slave, 1).owner.isdefault() is True
|
||||
#
|
||||
api.forcepermissive.config(confwrite).option(path).value.pop(0)
|
||||
api.forcepermissive.config(confread).option(a_slave, 0).value.get() == kwargs['default_multi']
|
||||
assert api.forcepermissive.config(confread).option(a_slave, 0).owner.isdefault() is True
|
||||
|
||||
|
||||
@autocheck
|
||||
def autocheck_reset_value_permissive(api, path, confread, confwrite, **kwargs):
|
||||
# check if is a multi, a master or a slave
|
||||
isslave = api.unrestraint.option(path).option.isslave()
|
||||
_autocheck_set_value(api, path, confwrite, **kwargs)
|
||||
_set_value(api, path, confwrite, **kwargs)
|
||||
|
||||
# reset value with permissive
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
@ -510,12 +619,18 @@ def autocheck_reset_value_permissive(api, path, confread, confwrite, **kwargs):
|
||||
def autocheck_display(api, path, confread, confwrite, **kwargs):
|
||||
"""re set value
|
||||
"""
|
||||
if kwargs['callback']:
|
||||
return
|
||||
make_dict = kwargs['make_dict']
|
||||
make_dict_value = kwargs['make_dict_value']
|
||||
#print(make_dict)
|
||||
#print(make_dict_value)
|
||||
#print(api.config(confread).config.make_dict())
|
||||
assert api.config(confread).config.make_dict() == make_dict
|
||||
if confread != confwrite:
|
||||
assert(api.config(confwrite).config.make_dict()) == make_dict
|
||||
_autocheck_set_value(api, path, confwrite, **kwargs)
|
||||
_set_value(api, path, confwrite, **kwargs)
|
||||
#print(api.config(confread).config.make_dict())
|
||||
assert api.config(confread).config.make_dict() == make_dict_value
|
||||
if confread != confwrite:
|
||||
assert(api.config(confwrite).config.make_dict()) == make_dict_value
|
||||
@ -550,8 +665,12 @@ def _check_default_properties(api, path, conf, kwargs, props_permissive, props):
|
||||
raises(APIError, "api.unrestraint.option(path).property.get()")
|
||||
else:
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
assert set(api.config(conf).option(path, 0).property.get()) == set(props)
|
||||
assert set(api.config(conf).option(path, 1).property.get()) == set(props)
|
||||
assert set(api.config(conf).option(path, 0).property.get()) == set(props_permissive)
|
||||
assert set(api.config(conf).option(path, 1).property.get()) == set(props_permissive)
|
||||
elif not kwargs.get('propertyerror', False):
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path).property.get()")
|
||||
assert set(api.forcepermissive.config(conf).option(path, 0).property.get()) == set(props)
|
||||
assert set(api.forcepermissive.config(conf).option(path, 1).property.get()) == set(props)
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 0).property.get()")
|
||||
raises(APIError, "api.unrestraint.option(path, 0).property.get()")
|
||||
@ -697,25 +816,25 @@ def _check_owner(api, path, conf, kwargs, owner, permissive_owner):
|
||||
raises(PropertiesOptionError, "api.forcepermissive.config(conf).option(path).owner.get()")
|
||||
else:
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
assert api.option(path, 0).owner.get() == 'default'
|
||||
assert api.option(path, 1).owner.get() == owner
|
||||
assert api.forcepermissive.option(path, 0).owner.get() == 'default'
|
||||
assert api.forcepermissive.option(path, 1).owner.get() == owner
|
||||
assert api.config(conf).option(path, 0).owner.get() == 'default'
|
||||
assert api.forcepermissive.config(conf).option(path, 0).owner.get() == 'default'
|
||||
assert api.config(conf).option(path, 1).owner.get() == owner
|
||||
assert api.forcepermissive.config(conf).option(path, 1).owner.get() == owner
|
||||
elif not kwargs.get('propertyerror', False):
|
||||
raises(PropertiesOptionError, "api.option(path, 0).owner.get()")
|
||||
raises(PropertiesOptionError, "api.option(path, 1).owner.get()")
|
||||
assert api.forcepermissive.option(path, 0).owner.get() == 'default'
|
||||
assert api.forcepermissive.option(path, 1).owner.get() == permissive_owner
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 0).owner.get()")
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 1).owner.get()")
|
||||
assert api.forcepermissive.config(conf).option(path, 0).owner.get() == 'default'
|
||||
assert api.forcepermissive.config(conf).option(path, 1).owner.get() == permissive_owner
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.option(path, 0).owner.get()")
|
||||
raises(PropertiesOptionError, "api.forcepermissive.option(path, 0).owner.get()")
|
||||
raises(PropertiesOptionError, "api.config(conf).option(path, 0).owner.get()")
|
||||
raises(PropertiesOptionError, "api.forcepermissive.config(conf).option(path, 0).owner.get()")
|
||||
|
||||
|
||||
@autocheck
|
||||
def autocheck_owner_with_value(api, path, confread, confwrite, **kwargs):
|
||||
"""value is now changed, check owner in this case
|
||||
"""
|
||||
_autocheck_set_value(api, path, confwrite, **kwargs)
|
||||
_set_value(api, path, confwrite, **kwargs)
|
||||
_check_owner(api, path, confwrite, kwargs, OWNER, OWNER)
|
||||
if confread != confwrite:
|
||||
_check_owner(api, path, confread, kwargs, owners.meta, owners.meta)
|
||||
@ -723,15 +842,28 @@ def autocheck_owner_with_value(api, path, confread, confwrite, **kwargs):
|
||||
|
||||
@autocheck
|
||||
def autocheck_default_owner_with_value(api, path, confread, confwrite, **kwargs):
|
||||
_autocheck_set_value(api, path, confwrite, **kwargs)
|
||||
isslave = api.unrestraint.option(path).option.isslave()
|
||||
_set_value(api, path, confwrite, **kwargs)
|
||||
|
||||
# test if is default owner without permissive
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
assert api.config(confwrite).option(path).owner.isdefault() is False
|
||||
assert api.config(confread).option(path).owner.isdefault() is False
|
||||
if not isslave:
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
assert api.config(confwrite).option(path).owner.isdefault() is False
|
||||
if confwrite != confread:
|
||||
assert api.config(confread).option(path).owner.isdefault() is False
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.config(confwrite).option(path).owner.isdefault()")
|
||||
raises(PropertiesOptionError, "api.config(confread).option(path).owner.isdefault()")
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.config(confwrite).option(path).owner.isdefault()")
|
||||
raises(PropertiesOptionError, "api.config(confread).option(path).owner.isdefault()")
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
assert api.config(confwrite).option(path, 0).owner.isdefault() is True
|
||||
assert api.config(confwrite).option(path, 1).owner.isdefault() is False
|
||||
if confwrite != confread:
|
||||
assert api.config(confread).option(path, 0).owner.isdefault() is True
|
||||
assert api.config(confread).option(path, 1).owner.isdefault() is False
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.config(confwrite).option(path, 0).owner.isdefault()")
|
||||
raises(PropertiesOptionError, "api.config(confread).option(path, 0).owner.isdefault()")
|
||||
|
||||
|
||||
@autocheck
|
||||
@ -739,7 +871,7 @@ def autocheck_default_owner_with_value_permissive(api, path, confread, confwrite
|
||||
# check if is a isslave
|
||||
isslave = api.unrestraint.option(path).option.isslave()
|
||||
|
||||
_autocheck_set_value(api, path, confwrite, **kwargs)
|
||||
_set_value(api, path, confwrite, **kwargs)
|
||||
|
||||
def do(conf):
|
||||
# test if is default owner with permissive
|
||||
@ -771,7 +903,7 @@ def autocheck_set_owner(api, path, confread, confwrite, **kwargs):
|
||||
# test set owner without permissive
|
||||
isslave = api.unrestraint.option(path).option.isslave()
|
||||
|
||||
_autocheck_set_value(api, path, confwrite, **kwargs)
|
||||
_set_value(api, path, confwrite, **kwargs)
|
||||
|
||||
# set owner without permissive
|
||||
if not isslave:
|
||||
@ -797,7 +929,7 @@ def autocheck_set_owner(api, path, confread, confwrite, **kwargs):
|
||||
def autocheck_set_owner_permissive(api, path, confread, confwrite, **kwargs):
|
||||
isslave = api.unrestraint.option(path).option.isslave()
|
||||
|
||||
_autocheck_set_value(api, path, confwrite, **kwargs)
|
||||
_set_value(api, path, confwrite, **kwargs)
|
||||
|
||||
# set owner with permissive
|
||||
if not kwargs.get('propertyerror', False):
|
||||
@ -848,7 +980,7 @@ def autocheck_option(api, path, confread, confwrite, **kwargs):
|
||||
assert doc == "{}'s option".format(expected_name)
|
||||
|
||||
|
||||
@autocheck
|
||||
#@autocheck
|
||||
def autocheck_permissive(api, path, confread, confwrite, **kwargs):
|
||||
"""test permissive for hidden and disabled value
|
||||
"""
|
||||
@ -966,7 +1098,7 @@ def autocheck_find(api, path, confread, confwrite, **kwargs):
|
||||
do(confwrite)
|
||||
|
||||
|
||||
def check_all(cfg, paths, path, meta, multi, default, default_multi, require, consistency, weakrefs, **kwargs):
|
||||
def check_all(cfg, paths, path, meta, multi, default, default_multi, require, consistency, callback, weakrefs, **kwargs):
|
||||
def _build_make_dict():
|
||||
dico = {}
|
||||
dico_value = {}
|
||||
@ -976,15 +1108,24 @@ def check_all(cfg, paths, path, meta, multi, default, default_multi, require, co
|
||||
value = LIST_FIRST_VALUE
|
||||
else:
|
||||
value = SUBLIST_FIRST_VALUE
|
||||
if not default or submulti:
|
||||
if not default or multi is submulti:
|
||||
if not multi:
|
||||
default_value = None
|
||||
else:
|
||||
default_value = []
|
||||
else:
|
||||
default_value = value
|
||||
kwargs['default'] = default_value
|
||||
if '.' in path:
|
||||
if paths.get(path, {}) is None:
|
||||
isslave = False
|
||||
else:
|
||||
isslave = paths.get(path, {}).get(path.rsplit('.', 1)[0], {}).get('master') is True and not path.endswith('.first')
|
||||
if isslave and not multi is submulti:
|
||||
kwargs['default'] = None
|
||||
|
||||
is_dyn = False
|
||||
is_master = False
|
||||
dyns = []
|
||||
has_value = False
|
||||
for cpath, options in paths.items():
|
||||
@ -999,6 +1140,8 @@ def check_all(cfg, paths, path, meta, multi, default, default_multi, require, co
|
||||
continue
|
||||
if options.get(dirname, {}).get('dyn'):
|
||||
is_dyn = True
|
||||
if options.get(dirname, {}).get('master'):
|
||||
is_master = True
|
||||
no_propertieserror = not options.get(name, {}).get('disabled') and not options.get(name, {}).get('hidden')
|
||||
allow_req = require and req
|
||||
if is_dyn:
|
||||
@ -1009,11 +1152,11 @@ def check_all(cfg, paths, path, meta, multi, default, default_multi, require, co
|
||||
dico_value[cpath] = value
|
||||
else:
|
||||
dico_value[cpath] = default_value
|
||||
|
||||
has_value = True
|
||||
if is_dyn:
|
||||
idx = 0
|
||||
for cpath in list(paths.keys())[len(dyns):]:
|
||||
|
||||
if dyns[idx]:
|
||||
dico[cpath] = default_value
|
||||
if path == cpath:
|
||||
@ -1048,6 +1191,43 @@ def check_all(cfg, paths, path, meta, multi, default, default_multi, require, co
|
||||
else:
|
||||
dico[cpath + 'extraoptconsistency'] = value
|
||||
dico_value[cpath + 'extraoptconsistency'] = value
|
||||
if is_master:
|
||||
for cpath in list(paths.keys())[len(dyns):]:
|
||||
if cpath.endswith('.first'):
|
||||
second_path = cpath.rsplit('.', 1)[0] + '.second'
|
||||
third_path = cpath.rsplit('.', 1)[0] + '.third'
|
||||
cons_path = cpath.rsplit('.', 1)[0] + '.extraoptconsistency'
|
||||
#
|
||||
if default_multi:
|
||||
if multi is not submulti:
|
||||
dvalue = SECOND_VALUE
|
||||
else:
|
||||
dvalue = LIST_SECOND_VALUE
|
||||
else:
|
||||
dvalue = []
|
||||
if dvalue == [] and multi is not submulti:
|
||||
dvalue = None
|
||||
#
|
||||
kwargs['default_multi'] = dvalue
|
||||
if isslave:
|
||||
kwargs['default'] = dvalue
|
||||
len_master = len(dico[cpath])
|
||||
if second_path in dico:
|
||||
dico[second_path] = [dvalue] * len_master
|
||||
if third_path in dico:
|
||||
dico[third_path] = [dvalue] * len_master
|
||||
if cons_path in dico:
|
||||
dico[cons_path] = [dvalue] * len_master
|
||||
#
|
||||
len_master = len(dico_value[cpath])
|
||||
if second_path in dico_value:
|
||||
dico_value[second_path] = [dvalue] * len_master
|
||||
if third_path in dico_value:
|
||||
dico_value[third_path] = [dvalue] * len_master
|
||||
cons_path = cpath.rsplit('.', 1)[0] + '.extraoptconsistency'
|
||||
if cons_path in dico_value:
|
||||
dico_value[cons_path] = [dvalue] * len_master
|
||||
break
|
||||
return dico, dico_value
|
||||
if DISPLAY:
|
||||
text = u' {} launch tests for {}'.format(ICON, path)
|
||||
@ -1075,6 +1255,7 @@ def check_all(cfg, paths, path, meta, multi, default, default_multi, require, co
|
||||
idx = 0
|
||||
for req in requires:
|
||||
kwargs['make_dict'], kwargs['make_dict_value'] = _build_make_dict()
|
||||
kwargs['callback'] = callback
|
||||
for func in autocheck_registers:
|
||||
cfg_name = 'conftest' + str(idx)
|
||||
idx += 1
|
||||
@ -1085,12 +1266,42 @@ def check_all(cfg, paths, path, meta, multi, default, default_multi, require, co
|
||||
ncfg = MetaConfig([ncfg], session_id='metatest')
|
||||
weakrefs.append(weakref.ref(cfg))
|
||||
api = getapi(ncfg)
|
||||
ckwargs = copy(kwargs)
|
||||
if api.unrestraint.option(path).option.isslave():
|
||||
master_path = path.rsplit('.', 1)[0] + '.master'
|
||||
api.option(master_path).value.set(LIST_SECOND_VALUE)
|
||||
dirname = path.rsplit('.', 1)[0]
|
||||
master_path = dirname + '.first'
|
||||
if multi is submulti:
|
||||
value = SUBLIST_SECOND_VALUE
|
||||
else:
|
||||
value = LIST_SECOND_VALUE
|
||||
api.option(master_path).value.set(value)
|
||||
ckwargs['make_dict'][master_path] = value
|
||||
ckwargs['make_dict_value'][master_path] = value
|
||||
if default_multi:
|
||||
if multi is not submulti:
|
||||
dvalue = SECOND_VALUE
|
||||
else:
|
||||
dvalue = LIST_SECOND_VALUE
|
||||
elif multi is submulti:
|
||||
dvalue = []
|
||||
else:
|
||||
dvalue = None
|
||||
if dirname + '.second' in ckwargs['make_dict']:
|
||||
ckwargs['make_dict'][dirname + '.second'] = [dvalue] * len(value)
|
||||
ckwargs['make_dict_value'][dirname + '.second'] = [dvalue] * len(value)
|
||||
if path == dirname + '.second':
|
||||
ckwargs['make_dict_value'][dirname + '.second'][-1] = ckwargs['make_dict_value'][master_path][-1]
|
||||
if dirname + '.third' in ckwargs['make_dict']:
|
||||
ckwargs['make_dict'][dirname + '.third'] = [dvalue] * len(value)
|
||||
ckwargs['make_dict_value'][dirname + '.third'] = [dvalue] * len(value)
|
||||
if path == dirname + '.third':
|
||||
ckwargs['make_dict_value'][dirname + '.third'][-1] = ckwargs['make_dict_value'][master_path][-1]
|
||||
if dirname + '.extraoptconsistency' in ckwargs['make_dict']:
|
||||
ckwargs['make_dict'][dirname + '.extraoptconsistency'] = [dvalue] * len(value)
|
||||
ckwargs['make_dict_value'][dirname + '.extraoptconsistency'] = [dvalue] * len(value)
|
||||
|
||||
#FIXME devrait etre dans la config ca ...
|
||||
api.read_write()
|
||||
ckwargs = copy(kwargs)
|
||||
if req:
|
||||
api.option('extraoptrequire').value.set('value')
|
||||
if 'permissive' in ckwargs and not 'permissive_od' in ckwargs or \
|
||||
@ -1108,8 +1319,10 @@ def check_all(cfg, paths, path, meta, multi, default, default_multi, require, co
|
||||
msg += u' as a multi'
|
||||
elif multi is submulti:
|
||||
msg += u' as a submulti'
|
||||
if multi is True:
|
||||
if default is True:
|
||||
msg += u' with default value'
|
||||
if callback is True:
|
||||
msg += u' (callback)'
|
||||
print(u'{}: {}'.format(msg, ckwargs))
|
||||
raise err
|
||||
del api
|
||||
@ -1123,12 +1336,11 @@ def check_deref(weakrefs):
|
||||
assert wrf() is None
|
||||
|
||||
|
||||
def make_conf(options, meta, multi, default, default_multi, require, consistency):
|
||||
def make_conf(options, meta, multi, default, default_multi, require, consistency, callback):
|
||||
weakrefs = []
|
||||
dyn = []
|
||||
goptions = []
|
||||
def make_option(path, option_infos):
|
||||
#FIXME
|
||||
def make_option(path, option_infos, in_master, master):
|
||||
option_type = 'str'
|
||||
option_properties = []
|
||||
option_requires = []
|
||||
@ -1144,20 +1356,34 @@ def make_conf(options, meta, multi, default, default_multi, require, consistency
|
||||
isslave = option_infos.get('slave', False)
|
||||
args = [path, "{}'s option".format(path)]
|
||||
kwargs = {}
|
||||
call_kwargs = {}
|
||||
if option_properties != []:
|
||||
kwargs['properties'] = tuple(option_properties)
|
||||
if callback:
|
||||
call_kwargs['properties'] = tuple(option_properties)
|
||||
if option_requires != []:
|
||||
kwargs['requires'] = option_requires
|
||||
if callback:
|
||||
call_kwargs['requires'] = option_requires
|
||||
else:
|
||||
kwargs['requires'] = option_requires
|
||||
if multi and path is not 'extraoptrequire':
|
||||
kwargs['multi'] = multi
|
||||
if default and not submulti:
|
||||
if callback:
|
||||
call_kwargs['multi'] = multi
|
||||
if ((not in_master or master) and default) and path is not 'extraoptrequire' and not path.endswith('extraoptconsistency'):
|
||||
if multi is False:
|
||||
value = FIRST_VALUE
|
||||
elif multi is True:
|
||||
value = LIST_FIRST_VALUE
|
||||
else:
|
||||
value = SUBLIST_EMPTY_VALUE
|
||||
kwargs['default'] = value
|
||||
if callback:
|
||||
kwargs['callback'] = return_str
|
||||
call_kwargs['default'] = value
|
||||
else:
|
||||
kwargs['default'] = value
|
||||
elif callback:
|
||||
return None, None
|
||||
if default_multi and path is not 'extraoptrequire':
|
||||
if multi is not submulti:
|
||||
value = SECOND_VALUE
|
||||
@ -1166,6 +1392,12 @@ def make_conf(options, meta, multi, default, default_multi, require, consistency
|
||||
kwargs['default_multi'] = value
|
||||
|
||||
tiramisu_option = OPTIONS_TYPE[option_type]['option']
|
||||
if callback:
|
||||
largs = [path + 'call', "{}'s callback option".format(path)]
|
||||
objcall = tiramisu_option(*largs, **call_kwargs)
|
||||
kwargs['callback_params'] = {'': ((objcall, False),)}
|
||||
else:
|
||||
objcall = None
|
||||
obj = tiramisu_option(*args, **kwargs)
|
||||
if not 'extraopt' in path and consistency:
|
||||
if require:
|
||||
@ -1173,8 +1405,7 @@ def make_conf(options, meta, multi, default, default_multi, require, consistency
|
||||
else:
|
||||
gopt = goptions[0]
|
||||
obj.impl_add_consistency('not_equal', gopt, warnings_only=True)
|
||||
weakrefs.append(weakref.ref(obj))
|
||||
return obj
|
||||
return obj, objcall
|
||||
|
||||
def make_optiondescriptions(path, collected):
|
||||
infos = collected.get('properties', {})
|
||||
@ -1234,13 +1465,33 @@ def make_conf(options, meta, multi, default, default_multi, require, consistency
|
||||
local_collect_options = local_collect_options[optiondescription]
|
||||
local_collect_options['properties'].update(option.get(optiondescription, {}))
|
||||
option_name = path.split('.')[-1]
|
||||
obj = make_option(option_name, option.get(option_name))
|
||||
if '.' in path:
|
||||
name_od = path.rsplit('.', 1)[0]
|
||||
else:
|
||||
name_od = ''
|
||||
in_master = collect_options.get(name_od, {}).get('properties', {}).get('master')
|
||||
master = in_master and path.endswith('first')
|
||||
obj, objcall = make_option(option_name, option.get(option_name), in_master, master)
|
||||
if obj is None:
|
||||
return None, None, None
|
||||
weakrefs.append(weakref.ref(obj))
|
||||
if callback:
|
||||
weakrefs.append(weakref.ref(objcall))
|
||||
if '.' in path:
|
||||
if master:
|
||||
local_collect_options.setdefault('options', []).insert(0, obj)
|
||||
else:
|
||||
local_collect_options.setdefault('options', []).append(obj)
|
||||
else:
|
||||
local_collect_options.setdefault('options', []).append(obj)
|
||||
goptions.append(obj)
|
||||
local_collect_options.setdefault('options', []).append(obj)
|
||||
if callback:
|
||||
local_collect_options.setdefault('options', []).append(objcall)
|
||||
goptions.append(objcall)
|
||||
|
||||
rootod = make_optiondescriptions('root', collect_options)
|
||||
if rootod is None:
|
||||
return None, None
|
||||
return None, None, None
|
||||
cfg = Config(rootod, session_id='conftest')
|
||||
weakrefs.append(weakref.ref(cfg))
|
||||
del goptions
|
||||
@ -1266,9 +1517,9 @@ DICT_PATHS = [
|
||||
('subod.second', {'second': {'disabled': True}}),
|
||||
('subod.subsubod.third', {'third': {'hidden': True}})]),
|
||||
#test a config with masterslaves
|
||||
OrderedDict([('odmaster.first', {'master': {'master': True}}),
|
||||
('odmaster.second', {'second': {'disabled': True, 'slave': True}}),
|
||||
('odmaster.third', {'third': {'hidden': True, 'slave': True}})]),
|
||||
OrderedDict([('odmaster.first', {'odmaster': {'master': True}}),
|
||||
('odmaster.second', {'odmaster': {'master': True}, 'second': {'disabled': True, 'slave': True}}),
|
||||
('odmaster.third', {'odmaster': {'master': True}, 'third': {'hidden': True, 'slave': True}})]),
|
||||
#test a config with dynoption
|
||||
OrderedDict([('subod.first', {'subod': {'dyn': True}}),
|
||||
('subod.second', {'second': {'disabled': True}}),
|
||||
@ -1338,33 +1589,39 @@ def test_options(paths):
|
||||
|
||||
lpaths = list(paths.keys())
|
||||
for meta in (False, True):
|
||||
for consistency in (False, True):
|
||||
for require in (False, True):
|
||||
for default_multi in (False, True):
|
||||
for default in (False, True):
|
||||
for multi in (False, True, submulti):
|
||||
if multi is submulti and consistency:
|
||||
continue
|
||||
if multi is False and default_multi:
|
||||
continue
|
||||
cfg, weakrefs, dyn = make_conf(paths, meta, multi, default, default_multi, require, consistency)
|
||||
if cfg is None:
|
||||
continue
|
||||
if dyn:
|
||||
cnt = 0
|
||||
idx = 0
|
||||
for index, lpath in enumerate(lpaths):
|
||||
if paths[lpath]:
|
||||
cnt += 1
|
||||
else:
|
||||
check_all(cfg, paths, lpaths[index], meta, multi, default,
|
||||
default_multi, require, consistency, weakrefs, **get_kwargs(lpaths[idx]))
|
||||
idx += 1
|
||||
if idx == cnt:
|
||||
idx = 0
|
||||
else:
|
||||
for lpath in lpaths:
|
||||
check_all(cfg, paths, lpath, meta, multi, default,
|
||||
default_multi, require, consistency, weakrefs, **get_kwargs(lpath))
|
||||
del cfg
|
||||
check_deref(weakrefs)
|
||||
for callback in (False, True):
|
||||
for consistency in (False, True):
|
||||
for require in (False, True):
|
||||
for default_multi in (False, True):
|
||||
if callback and default_multi:
|
||||
continue
|
||||
for default in (False, True):
|
||||
for multi in (False, True, submulti):
|
||||
if multi is submulti and default:
|
||||
continue
|
||||
if multi is submulti and consistency:
|
||||
continue
|
||||
if multi is False and default_multi:
|
||||
continue
|
||||
cfg, weakrefs, dyn = make_conf(paths, meta, multi, default, default_multi, require, consistency, callback)
|
||||
if cfg is None:
|
||||
continue
|
||||
if dyn:
|
||||
cnt = 0
|
||||
idx = 0
|
||||
for index, lpath in enumerate(lpaths):
|
||||
if paths[lpath]:
|
||||
cnt += 1
|
||||
else:
|
||||
check_all(cfg, paths, lpaths[index], meta, multi, default,
|
||||
default_multi, require, consistency, callback, weakrefs, **get_kwargs(lpaths[idx]))
|
||||
idx += 1
|
||||
if idx == cnt:
|
||||
idx = 0
|
||||
else:
|
||||
for lpath in lpaths:
|
||||
check_all(cfg, paths, lpath, meta, multi, default,
|
||||
default_multi, require, consistency, callback, weakrefs, **get_kwargs(lpath))
|
||||
del cfg
|
||||
check_deref(weakrefs)
|
||||
display_count()
|
||||
|
||||
Reference in New Issue
Block a user