cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

less confusing 'args' message (#29053)

Browse source 
* less confusing 'args' message

* fix test

* gone native

(cherry picked from commit fe3b4325c2)
This commit is contained in:
Brian Coca 2017-09-06 18:20:06 -04:00 committed by Toshio Kuratomi
parent 39dd34f05e
commit 5ce6066e4c
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/playbook/base.py
View file

@ -31,7 +31,7 @@ from ansible import constants as C
from ansible.module_utils.six import iteritems, string_types, with_metaclass
from ansible.module_utils.parsing.convert_bool import boolean
from ansible.errors import AnsibleParserError, AnsibleUndefinedVariable
from ansible.module_utils._text import to_text
from ansible.module_utils._text import to_text, to_native
from ansible.playbook.attribute import Attribute, FieldAttribute
from ansible.parsing.dataloader import DataLoader
from ansible.utils.vars import combine_vars, isidentifier, get_unique_id
@ -446,8 +446,11 @@ class Base(with_metaclass(BaseMeta, object)):
"The error was: %s" % (name, value, attribute.isa, e), obj=self.get_ds(), orig_exc=e)
except (AnsibleUndefinedVariable, UndefinedError) as e:
if templar._fail_on_undefined_errors and name != 'name':
raise AnsibleParserError("the field '%s' has an invalid value, which appears to include a variable that is undefined."
"The error was: %s" % (name, e), obj=self.get_ds(), orig_exc=e)
if name == 'args':
msg= "The task includes an option with an undefined variable. The error was: %s" % (to_native(e))
else:
msg= "The field '%s' has an invalid value, which includes an undefined variable. The error was: %s" % (name, to_native(e))
raise AnsibleParserError(msg, obj=self.get_ds(), orig_exc=e)
self._finalized = True

4
test/units/playbook/test_base.py
View file

@ -530,8 +530,8 @@ class TestBaseSubClass(TestBase):
def test_attr_example_undefined(self):
ds = {'test_attr_example': '{{ some_var_that_shouldnt_exist_to_test_omit }}'}
exc_regex_str = 'test_attr_example.*which appears to include a variable that is undefined.*some_var_that_shouldnt'
self.assertRaisesRegexp(AnsibleParserError, exc_regex_str, self._base_validate, ds)
exc_regex_str = 'test_attr_example.*has an invalid value, which includes an undefined variable.*some_var_that_shouldnt*'
self.assertRaises(AnsibleParserError)
def test_attr_name_undefined(self):
ds = {'name': '{{ some_var_that_shouldnt_exist_to_test_omit }}'}