diff options
author | Matt Martz <matt@sivel.net> | 2017-11-13 10:51:18 -0600 |
---|---|---|
committer | ansibot <ansibot@users.noreply.github.com> | 2017-11-13 11:51:18 -0500 |
commit | 99d4f5bab4d334c0457a0cc6635f3104ca672834 (patch) | |
tree | fc9525a0fe6df89b03e629eeb0fa2c216dbfe266 /lib/ansible/playbook/helpers.py | |
parent | 464ded80f563483327208313e6bc78ce2cff2c4f (diff) | |
download | ansible-99d4f5bab4d334c0457a0cc6635f3104ca672834.tar.gz |
Remove uses of assert in production code (#32079)
* Remove uses of assert in production code
* Fix assertion
* Add code smell test for assertions, currently limited to lib/ansible
* Fix assertion
* Add docs for no-assert
* Remove new assert from enos
* Fix assert in module_utils.connection
Diffstat (limited to 'lib/ansible/playbook/helpers.py')
-rw-r--r-- | lib/ansible/playbook/helpers.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/ansible/playbook/helpers.py b/lib/ansible/playbook/helpers.py index 50355674df..06d7315488 100644 --- a/lib/ansible/playbook/helpers.py +++ b/lib/ansible/playbook/helpers.py @@ -21,7 +21,7 @@ __metaclass__ = type import os from ansible import constants as C -from ansible.errors import AnsibleParserError, AnsibleUndefinedVariable, AnsibleFileNotFound +from ansible.errors import AnsibleParserError, AnsibleUndefinedVariable, AnsibleFileNotFound, AnsibleAssertionError from ansible.module_utils.six import string_types try: @@ -43,7 +43,8 @@ def load_list_of_blocks(ds, play, parent_block=None, role=None, task_include=Non from ansible.playbook.task_include import TaskInclude from ansible.playbook.role_include import IncludeRole - assert isinstance(ds, (list, type(None))), '%s should be a list or None but is %s' % (ds, type(ds)) + if not isinstance(ds, (list, type(None))): + raise AnsibleAssertionError('%s should be a list or None but is %s' % (ds, type(ds))) block_list = [] if ds: @@ -89,11 +90,13 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h from ansible.playbook.handler_task_include import HandlerTaskInclude from ansible.template import Templar - assert isinstance(ds, list), 'The ds (%s) should be a list but was a %s' % (ds, type(ds)) + if not isinstance(ds, list): + raise AnsibleAssertionError('The ds (%s) should be a list but was a %s' % (ds, type(ds))) task_list = [] for task_ds in ds: - assert isinstance(task_ds, dict), 'The ds (%s) should be a dict but was a %s' % (ds, type(ds)) + if not isinstance(task_ds, dict): + AnsibleAssertionError('The ds (%s) should be a dict but was a %s' % (ds, type(ds))) if 'block' in task_ds: t = Block.load( @@ -345,7 +348,8 @@ def load_list_of_roles(ds, play, current_role_path=None, variable_manager=None, # we import here to prevent a circular dependency with imports from ansible.playbook.role.include import RoleInclude - assert isinstance(ds, list), 'ds (%s) should be a list but was a %s' % (ds, type(ds)) + if not isinstance(ds, list): + raise AnsibleAssertionError('ds (%s) should be a list but was a %s' % (ds, type(ds))) roles = [] for role_def in ds: |