modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-05 03:38:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

support for dicts + tests

Browse Source
This commit is contained in:
Filip Valder
2017-02-28 20:54:03 +01:00
parent 6b343896dd
commit 6dd223fd12
2 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
module_build_service/utils.py
View File

@@ -784,7 +784,7 @@ def get_reusable_component(session, module, component_name):
return None
def validate_koji_tag(tag_arg_name, pre='', post='-'):
def validate_koji_tag(tag_arg_name, pre='', post='-', dict_key='name'):
"""
Used as a decorator validates koji tag arg value (which may be str or list)
against configurable list of koji tag prefixes.
@@ -792,6 +792,7 @@ def validate_koji_tag(tag_arg_name, pre='', post='-'):
validation) to each koji tag prefix.
:param post: Append this string/delimiter ('-' by default) to each koji
tag prefix.
:param dict_key: In case of a dict arg, inspect this key ('name' by default).
"""
def validation_decorator(function):
def wrapper(*args, **kwargs):
@@ -799,8 +800,16 @@ def validate_koji_tag(tag_arg_name, pre='', post='-'):
if tag_arg_name not in call_args:
raise ProgrammingError(
'Koji tag validation: Inspected argument {} is not within function args.'
.format(tag_arg_name))
if isinstance(call_args[tag_arg_name], list):
' The function was: {}.'
.format(tag_arg_name, function.__name__))
if isinstance(call_args[tag_arg_name], dict):
if dict_key not in call_args[tag_arg_name]:
raise ProgrammingError(
'Koji tag validation: Inspected dict arg {} does not contain {} key.'
' The function was: {}.'
.format(call_args[tag_arg_name], dict_key, function.__name__))
tag_list = [call_args[tag_arg_name][dict_key]]
elif isinstance(call_args[tag_arg_name], list):
tag_list = call_args[tag_arg_name]
else:
tag_list = [call_args[tag_arg_name]]

20
tests/test_utils/test_utils.py
View File

@@ -213,3 +213,23 @@ class TestUtils(unittest.TestCase):
self.assertEquals(
validate_koji_tag_good_tag_values_in_list(['module-foo',
'module-bar']), True)
def test_validate_koji_tag_good_tag_value_in_dict(self):
@module_build_service.utils.validate_koji_tag('tag_arg')
def validate_koji_tag_good_tag_value_in_dict(tag_arg):
return True
self.assertEquals(
validate_koji_tag_good_tag_value_in_dict({'name': 'module-foo'}), True)
def test_validate_koji_tag_good_tag_value_in_dict_nondefault_key(self):
@module_build_service.utils.validate_koji_tag('tag_arg',
dict_key='nondefault')
def validate_koji_tag_good_tag_value_in_dict_nondefault_key(tag_arg):
return True
self.assertEquals(
validate_koji_tag_good_tag_value_in_dict_nondefault_key(
{'nondefault': 'module-foo'}), True)