update api
This commit is contained in:
@ -138,18 +138,15 @@ def autocheck_value(api, path, **kwargs):
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
if ismaster:
|
||||
raises(APIError, "api.option(path, 0).value.set(first_value[0])")
|
||||
api.option(path).value.append(first_value[0])
|
||||
api.option(path).value.set([first_value[0]])
|
||||
elif isslave:
|
||||
#FIXME
|
||||
print(api.option(path).value.append(first_value[0]))
|
||||
raises(PropertiesOptionError, "api.option(path).value.append(first_value[0])")
|
||||
api.option(path, 0).value.set(first_value[0])
|
||||
raise Exception('pouet')
|
||||
else:
|
||||
api.option(path).value.set(first_value)
|
||||
else:
|
||||
if ismaster:
|
||||
raises(PropertiesOptionError, "api.option(path).value.append(first_value[0])")
|
||||
raises(PropertiesOptionError, "api.option(path).value.set([first_value[0]])")
|
||||
elif isslave:
|
||||
raises(PropertiesOptionError, "api.option(path, 0).value.set(first_value[0])")
|
||||
else:
|
||||
@ -180,31 +177,30 @@ def autocheck_value(api, path, **kwargs):
|
||||
if ismaster:
|
||||
raises(APIError, "api.unrestraint.option(path).value.set(second_value[1])")
|
||||
elif isslave:
|
||||
raises(APIError, "api.unrestraint.option(path).value.append(second_value[1])")
|
||||
raises(APIError, "api.unrestraint.option(path).value.set([first_value[0], second_value[1]])")
|
||||
else:
|
||||
raises(APIError, "api.unrestraint.option(path).value.set(second_value)")
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
if ismaster:
|
||||
raises(APIError, "api.forcepermissive.option(path, 1).value.set(second_value[1])")
|
||||
api.forcepermissive.option(path).value.append(second_value[1])
|
||||
api.forcepermissive.option(path).value.set([first_value[0], second_value[1]])
|
||||
elif isslave:
|
||||
#FIXME
|
||||
raises(PropertiesOptionError, "api.forcepermissive.option(path).value.append(second_value[1])")
|
||||
raises(PropertiesOptionError, "api.forcepermissive.option(path).value.set([first_value[0], second_value[1]])")
|
||||
api.option(path, 1).value.set(second_value[1])
|
||||
raise Exception('ca entre ici')
|
||||
else:
|
||||
api.option(path).value.set(second_value)
|
||||
elif kwargs.get('permissive', False):
|
||||
if ismaster:
|
||||
api.forcepermissive.option(path).value.append(second_value[0])
|
||||
api.forcepermissive.option(path).value.append(second_value[1])
|
||||
api.forcepermissive.option(path).value.set([first_value[0], second_value[1]])
|
||||
elif isslave:
|
||||
api.forcepermissive.option(path, 1).value.set(second_value[1])
|
||||
else:
|
||||
api.forcepermissive.option(path).value.set(first_value)
|
||||
else:
|
||||
if ismaster:
|
||||
raises(PropertiesOptionError, "api.forcepermissive.option(path).value.append(first_value[0])")
|
||||
raises(PropertiesOptionError, "api.forcepermissive.option(path).value.set([first_value[0]])")
|
||||
elif isslave:
|
||||
raises(PropertiesOptionError, "api.forcepermissive.option(path, 0).value.set(first_value[0])")
|
||||
else:
|
||||
@ -240,15 +236,8 @@ def autocheck_value(api, path, **kwargs):
|
||||
@autocheck
|
||||
def autocheck_reset_value(api, path, **kwargs):
|
||||
# check if is a multi, a master or a slave
|
||||
if not kwargs.get('propertyerror', False):
|
||||
multi = api.forcepermissive.option(path).option.ismulti()
|
||||
ismaster = api.forcepermissive.option(path).option.ismaster()
|
||||
isslave = api.forcepermissive.option(path).option.isslave()
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.forcepermissive.option(path).option.ismulti()")
|
||||
multi = api.unrestraint.option(path).option.ismulti()
|
||||
ismaster = api.unrestraint.option(path).option.ismaster()
|
||||
isslave = api.unrestraint.option(path).option.isslave()
|
||||
multi = api.unrestraint.option(path).option.ismulti()
|
||||
isslave = api.unrestraint.option(path).option.isslave()
|
||||
|
||||
# set default value (different if value is multi or not)
|
||||
if not multi:
|
||||
@ -337,14 +326,8 @@ def autocheck_property(api, path, **kwargs):
|
||||
"""get property from path
|
||||
"""
|
||||
# check if is a multi or a slave
|
||||
if not kwargs.get('propertyerror', False):
|
||||
multi = api.forcepermissive.option(path).option.ismulti()
|
||||
isslave = api.forcepermissive.option(path).option.isslave()
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.forcepermissive.option(path).option.ismulti()")
|
||||
raises(PropertiesOptionError, "api.forcepermissive.option(path).option.isslave()")
|
||||
multi = api.unrestraint.option(path).option.ismulti()
|
||||
isslave = api.unrestraint.option(path).option.isslave()
|
||||
multi = api.unrestraint.option(path).option.ismulti()
|
||||
isslave = api.unrestraint.option(path).option.isslave()
|
||||
|
||||
# define properties
|
||||
properties = ['prop1', 'prop2']
|
||||
@ -367,7 +350,10 @@ def autocheck_property(api, path, **kwargs):
|
||||
assert set(api.option(path, 0).property.get()) == set(default_props)
|
||||
assert set(api.option(path, 1).property.get()) == set(default_props)
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.option(path).property.get()")
|
||||
if not isslave:
|
||||
raises(PropertiesOptionError, "api.option(path).property.get()")
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.option(path, 0).property.get()")
|
||||
|
||||
# get properties with permissive
|
||||
if not isslave:
|
||||
@ -390,17 +376,21 @@ def autocheck_property(api, path, **kwargs):
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
api.option(path).property.set(properties)
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.option(path).property.set(properties)")
|
||||
if not isslave:
|
||||
raises(PropertiesOptionError, "api.option(path).property.set(properties)")
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.option(path, 0).property.set(properties)")
|
||||
|
||||
# check properties after set without permissive
|
||||
if not kwargs.get('permissive', False) and not kwargs.get('propertyerror', False):
|
||||
assert set(api.option(path).property.get()) == set(properties)
|
||||
assert set(api.forcepermissive.option(path).property.get()) == set(properties)
|
||||
elif kwargs.get('permissive', False):
|
||||
raises(PropertiesOptionError, "api.option(path).property.get()")
|
||||
if not isslave:
|
||||
raises(PropertiesOptionError, "api.option(path).property.get()")
|
||||
assert set(api.forcepermissive.option(path).property.get()) == set(default_props)
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.option(path, 0).property.get()")
|
||||
assert set(api.forcepermissive.option(path, 0).property.get()) == set(default_props)
|
||||
assert set(api.forcepermissive.option(path, 1).property.get()) == set(default_props)
|
||||
else:
|
||||
@ -588,7 +578,8 @@ def autocheck_owner_with_value(api, path, **kwargs):
|
||||
if not isslave:
|
||||
assert api.forcepermissive.option(path).owner.isdefault() is False
|
||||
else:
|
||||
assert api.forcepermissive.option(path, 0).owner.isdefault() is False
|
||||
assert api.forcepermissive.option(path, 0).owner.isdefault() is True
|
||||
assert api.forcepermissive.option(path, 1).owner.isdefault() is False
|
||||
else:
|
||||
raises(PropertiesOptionError, "api.forcepermissive.option(path).owner.isdefault()")
|
||||
|
||||
@ -773,18 +764,15 @@ def check_all(api, path, multi, **kwargs):
|
||||
|
||||
|
||||
def make_api(options, multi):
|
||||
def make_option(path):
|
||||
option_infos = path.split('_')
|
||||
def make_option(path, option_infos):
|
||||
#FIXME
|
||||
option_type = 'str'
|
||||
option_properties = []
|
||||
for option_info in option_infos[1:]:
|
||||
if option_info in OPTIONS_TYPE:
|
||||
option_type = option_info
|
||||
elif option_info in PROPERTIES:
|
||||
option_properties.append(option_info)
|
||||
else:
|
||||
raise Exception('unknown {} in {}'.format(option_info, path))
|
||||
args = [option_infos[0], "{}'s option".format(option_infos[0])]
|
||||
if option_infos is not None:
|
||||
for prop in PROPERTIES:
|
||||
if option_infos.get(prop, False) is True:
|
||||
option_properties.append(prop)
|
||||
args = [path, "{}'s option".format(path)]
|
||||
kwargs = {}
|
||||
if option_properties != []:
|
||||
kwargs['properties'] = tuple(option_properties)
|
||||
@ -794,28 +782,26 @@ def make_api(options, multi):
|
||||
return tiramisu_option(*args, **kwargs)
|
||||
|
||||
def make_optiondescriptions(path, collected):
|
||||
infos = path.split('_')
|
||||
name = infos[0]
|
||||
infos = collected.get('properties', {})
|
||||
properties = []
|
||||
kwargs = {}
|
||||
optiondescription = OptionDescription
|
||||
for info in infos[1:]:
|
||||
if info in PROPERTIES:
|
||||
properties.append(info)
|
||||
elif info == 'master':
|
||||
if not multi:
|
||||
return
|
||||
optiondescription = MasterSlaves
|
||||
elif info == 'dyn':
|
||||
optiondescription = DynOptionDescription
|
||||
kwargs['callback'] = return_list
|
||||
else:
|
||||
raise Exception('unknown {} in {}'.format(info, path))
|
||||
|
||||
for prop in PROPERTIES:
|
||||
if infos.get(prop, False) is True:
|
||||
properties.append(prop)
|
||||
if infos.get('master', False) is True:
|
||||
if not multi:
|
||||
return
|
||||
optiondescription = MasterSlaves
|
||||
if infos.get('dyn', False) is True:
|
||||
optiondescription = DynOptionDescription
|
||||
kwargs['callback'] = return_list
|
||||
options = []
|
||||
if 'options' in collected:
|
||||
options.extend(collected['options'])
|
||||
for key, values in collected.items():
|
||||
if key == 'options':
|
||||
if key in ['options', 'properties']:
|
||||
continue
|
||||
option = make_optiondescriptions(key, values)
|
||||
if option is None:
|
||||
@ -823,19 +809,20 @@ def make_api(options, multi):
|
||||
options.append(option)
|
||||
if properties != []:
|
||||
kwargs['properties'] = tuple(properties)
|
||||
return optiondescription(name, "{}'s optiondescription".format(name), options, **kwargs)
|
||||
return optiondescription(path, "{}'s optiondescription".format(path), options, **kwargs)
|
||||
|
||||
collect_options = {}
|
||||
for option in options:
|
||||
for path, option in options.items():
|
||||
if option is None:
|
||||
continue
|
||||
local_collect_options = collect_options
|
||||
for optiondescription in option.split('.')[:-1]:
|
||||
local_collect_options.setdefault(optiondescription, {})
|
||||
for optiondescription in path.split('.')[:-1]:
|
||||
local_collect_options.setdefault(optiondescription, {'properties': {}})
|
||||
local_collect_options = local_collect_options[optiondescription]
|
||||
path = '.'.join(option.split('.')[:-1])
|
||||
option_name = option.split('.')[-1]
|
||||
local_collect_options.setdefault("options", []).append(make_option(option_name))
|
||||
local_collect_options['properties'].update(option.get(optiondescription, {}))
|
||||
option_name = path.split('.')[-1]
|
||||
path = '.'.join(path.split('.')[:-1])
|
||||
local_collect_options.setdefault('options', []).append(make_option(option_name, option.get(option_name)))
|
||||
|
||||
rootod = make_optiondescriptions('root', collect_options)
|
||||
if rootod is None:
|
||||
@ -846,39 +833,45 @@ def make_api(options, multi):
|
||||
|
||||
DICT_PATHS = [
|
||||
#test a config without optiondescription
|
||||
OrderedDict([('first', 'first'),
|
||||
('second', 'second_disabled'),
|
||||
('third', 'third_hidden')]),
|
||||
OrderedDict([('first', {}),
|
||||
('second', {'second': {'disabled': True}}),
|
||||
('third', {'third': {'hidden': True}})]),
|
||||
#test a config with an optiondescription
|
||||
OrderedDict([('subod.first', 'subod.first'),
|
||||
('subod.second', 'subod.second_disabled'),
|
||||
('subod.third', 'subod.third_hidden')]),
|
||||
OrderedDict([('subod.first', {}),
|
||||
('subod.second', {'second': {'disabled': True}}),
|
||||
('subod.third', {'third': {'hidden': True}})]),
|
||||
#test a config with two optiondescription
|
||||
OrderedDict([('subod.subsubod.first', 'subod.subsubod.first'),
|
||||
('subod.subsubod.second', 'subod.subsubod.second_disabled'),
|
||||
('subod.subsubod.third', 'subod.subsubod.third_hidden')]),
|
||||
OrderedDict([('subod.subsubod.first', {}),
|
||||
('subod.subsubod.second', {'second': {'disabled': True}}),
|
||||
('subod.subsubod.third', {'third': {'hidden': True}})]),
|
||||
#test a config with mix of different optiondescription
|
||||
OrderedDict([('first', 'first'),
|
||||
('subod.second', 'subod.second_disabled'),
|
||||
('subod.subsubod.third', 'subod.subsubod.third_hidden')]),
|
||||
OrderedDict([('first', {}),
|
||||
('subod.second', {'second': {'disabled': True}}),
|
||||
('subod.subsubod.third', {'third': {'hidden': True}})]),
|
||||
#test a config with masterslaves
|
||||
OrderedDict([('first.first', 'first_master.first'),
|
||||
('first.second', 'first_master.second_disabled'),
|
||||
('first.third', 'first_master.third_hidden')]),
|
||||
OrderedDict([('odmaster.first', {'odmaster': {'master': True}}),
|
||||
('odmaster.second', {'second': {'disabled': True}}),
|
||||
('odmaster.third', {'third': {'hidden': True}})]),
|
||||
##test a config with dynoption
|
||||
OrderedDict([('subodval1.firstval1', 'subod_dyn.first'),
|
||||
('subodval1.secondval1', 'subod_dyn.second_disabled'),
|
||||
('subodval1.thirdval1', 'subod_dyn.third_hidden'),
|
||||
OrderedDict([('subod.first', {'subod': {'dyn': True}}),
|
||||
('subod.second', {'second': {'disabled': True}}),
|
||||
('subod.third', {'third': {'hidden': True}}),
|
||||
('subodval1.firstval1', None),
|
||||
('subodval1.secondval1', None),
|
||||
('subodval1.thirdval1', None),
|
||||
('subodval2.firstval2', None),
|
||||
('subodval2.secondval2', None),
|
||||
('subodval2.thirdval2', None)]),
|
||||
#test a config with dynoption subdir
|
||||
OrderedDict([('subod.subodval1.firstval1', 'subod.subod_dyn.first'),
|
||||
('subod.subodval1.secondval1', 'subod.subod_dyn.second_disabled'),
|
||||
('subod.subodval1.thirdval1', 'subod.subod_dyn.third_hidden'),
|
||||
('subod.subodval2.firstval2', None),
|
||||
('subod.subodval2.secondval2', None),
|
||||
('subod.subodval2.thirdval2', None)])
|
||||
OrderedDict([('subod.subsubod.first', {'subsubod': {'dyn': True}}),
|
||||
('subod.subsubod.second', {'second': {'disabled': True}}),
|
||||
('subod.subsubod.third', {'third': {'hidden': True}}),
|
||||
('subod.subsubodval1.firstval1', None),
|
||||
('subod.subsubodval1.secondval1', None),
|
||||
('subod.subsubodval1.thirdval1', None),
|
||||
('subod.subsubodval2.firstval2', None),
|
||||
('subod.subsubodval2.secondval2', None),
|
||||
('subod.subsubodval2.thirdval2', None)])
|
||||
]
|
||||
|
||||
|
||||
@ -892,31 +885,35 @@ def paths(request):
|
||||
def test_options(paths):
|
||||
lpaths = list(paths.keys())
|
||||
for multi in (False, True):
|
||||
api = make_api(paths.values(), multi)
|
||||
api = make_api(paths, multi)
|
||||
if api is None:
|
||||
continue
|
||||
check_all(api, lpaths[0], multi)
|
||||
check_all(api, lpaths[1], multi, propertyerror=True, extra_properties=['disabled'])
|
||||
check_all(api, lpaths[2], multi, permissive=True, extra_properties=['hidden'])
|
||||
if len(lpaths) == 6:
|
||||
if len(lpaths) == 9:
|
||||
check_all(api, lpaths[3], multi)
|
||||
check_all(api, lpaths[4], multi, propertyerror=True, extra_properties=['disabled'])
|
||||
check_all(api, lpaths[5], multi, permissive=True, extra_properties=['hidden'])
|
||||
##
|
||||
#print('')
|
||||
#print(api.help)
|
||||
check_all(api, lpaths[6], multi)
|
||||
check_all(api, lpaths[7], multi, propertyerror=True, extra_properties=['disabled'])
|
||||
check_all(api, lpaths[8], multi, permissive=True, extra_properties=['hidden'])
|
||||
else:
|
||||
check_all(api, lpaths[0], multi)
|
||||
check_all(api, lpaths[1], multi, propertyerror=True, extra_properties=['disabled'])
|
||||
check_all(api, lpaths[2], multi, permissive=True, extra_properties=['hidden'])
|
||||
|
||||
|
||||
DICT_PATHS2 = [
|
||||
OrderedDict([('subod.subsubod.first', 'subod.subsubod_hidden.first'),
|
||||
('subod.subsubod.second', 'subod.subsubod_hidden.second'),
|
||||
('subod.subsubod.third', 'subod.subsubod_hidden.third_hidden')]),
|
||||
OrderedDict([('subod.subodval1.firstval1', 'subod.subod_dyn_hidden.first'),
|
||||
('subod.subodval1.secondval1', 'subod.subod_dyn_hidden.second'),
|
||||
('subod.subodval1.thirdval1', 'subod.subod_dyn_hidden.third_hidden'),
|
||||
('subod.subodval2.firstval2', None),
|
||||
('subod.subodval2.secondval2', None),
|
||||
('subod.subodval2.thirdval2', None)])
|
||||
OrderedDict([('subod.subsubod.first', {'subsubod': {'hidden': True}}),
|
||||
('subod.subsubod.second', {}),
|
||||
('subod.subsubod.third', {})]),
|
||||
OrderedDict([('subod.subsubod.first', {'subsubod': {'dyn': True, 'hidden': True}}),
|
||||
('subod.subsubod.second', {}),
|
||||
('subod.subsubod.third', {}),
|
||||
('subod.subsubodval1.firstval1', None),
|
||||
('subod.subsubodval1.secondval1', None),
|
||||
('subod.subsubodval1.thirdval1', None),
|
||||
('subod.subsubodval2.firstval2', None),
|
||||
('subod.subsubodval2.secondval2', None),
|
||||
('subod.subsubodval2.thirdval2', None)])
|
||||
]
|
||||
|
||||
|
||||
@ -932,13 +929,17 @@ def test_tree_od_permissive(paths2):
|
||||
"""
|
||||
lpaths = list(paths2.keys())
|
||||
for multi in (False, True):
|
||||
api = make_api(paths2.values(), multi)
|
||||
api = make_api(paths2, multi)
|
||||
if api is None:
|
||||
continue
|
||||
check_all(api, lpaths[0], multi, permissive=True)
|
||||
check_all(api, lpaths[1], multi, permissive=True)
|
||||
check_all(api, lpaths[2], multi, permissive=True, extra_properties=['hidden'])
|
||||
if len(lpaths) == 6:
|
||||
if len(lpaths) == 9:
|
||||
check_all(api, lpaths[3], multi, permissive=True)
|
||||
check_all(api, lpaths[4], multi, permissive=True)
|
||||
check_all(api, lpaths[5], multi, permissive=True, extra_properties=['hidden'])
|
||||
check_all(api, lpaths[5], multi, permissive=True)
|
||||
check_all(api, lpaths[6], multi, permissive=True)
|
||||
check_all(api, lpaths[7], multi, permissive=True)
|
||||
check_all(api, lpaths[8], multi, permissive=True)
|
||||
else:
|
||||
check_all(api, lpaths[0], multi, permissive=True)
|
||||
check_all(api, lpaths[1], multi, permissive=True)
|
||||
check_all(api, lpaths[2], multi, permissive=True)
|
||||
|
||||
Reference in New Issue
Block a user