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

stringify conditional before handing it to Jinja2 for evaluation.

Browse source 
This should fix simple conditionals like:

    when: ansible_selinux

While here add tests for ansible.utils.check_conditional() in
"jinja2_compare mode".
This commit is contained in:
Stoned Elipot 2013-07-23 22:24:53 +02:00
parent d1effecb2e
commit a1503c4d59
2 changed files with 95 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/utils/__init__.py
View file

@ -164,7 +164,7 @@ def check_conditional(conditional, basedir, inject, fail_on_undefined=False):
conditional = inject[conditional]
conditional = template.template(basedir, conditional, inject, fail_on_undefined=fail_on_undefined)
# a Jinja2 evaluation that results in something Python can eval!
presented = "{% if " + conditional + " %} True {% else %} False {% endif %}"
presented = "{%% if %s %%} True {%% else %%} False {%% endif %%}" % conditional
conditional = template.template(basedir, presented, inject)
val = conditional.lstrip().rstrip()
if val == "True":

94
test/TestUtils.py
View file

@ -375,6 +375,100 @@ class TestUtils(unittest.TestCase):
assert res == u'hello wórld'
#####################################
### check_conditional tests
def test_check_conditional_jinja2_literals(self):
# see http://jinja.pocoo.org/docs/templates/#literals
# boolean
assert(ansible.utils.check_conditional(
'jinja2_compare true', '/', {}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare false', '/', {}) == False)
assert(ansible.utils.check_conditional(
'jinja2_compare True', '/', {}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare False', '/', {}) == False)
# integer
assert(ansible.utils.check_conditional(
'jinja2_compare 1', '/', {}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare 0', '/', {}) == False)
# string, beware, a string is truthy unless empty
assert(ansible.utils.check_conditional(
'jinja2_compare "yes"', '/', {}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare "no"', '/', {}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare ""', '/', {}) == False)
def test_check_conditional_jinja2_variable_literals(self):
# see http://jinja.pocoo.org/docs/templates/#literals
# boolean
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': 'True'}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': 'true'}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': 'False'}) == False)
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': 'false'}) == False)
# integer
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': '1'}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': 1}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': '0'}) == False)
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': 0}) == False)
# string, beware, a string is truthy unless empty
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': '"yes"'}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': '"no"'}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': '""'}) == False)
# Python boolean in Jinja2 expression
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': True}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': False}) == False)
def test_check_conditional_jinja2_expression(self):
assert(ansible.utils.check_conditional(
'jinja2_compare 1 == 1', '/', {}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare bar == 42', '/', {'bar': 42}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare bar != 42', '/', {'bar': 42}) == False)
def test_check_conditional_jinja2_expression_in_variable(self):
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': '1 == 1'}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': 'bar == 42', 'bar': 42}) == True)
assert(ansible.utils.check_conditional(
'jinja2_compare var', '/', {'var': 'bar != 42', 'bar': 42}) == False)
def test_check_conditional_jinja2_unicode(self):
assert(ansible.utils.check_conditional(
u'jinja2_compare "\u00df"', '/', {}) == True)
assert(ansible.utils.check_conditional(
u'jinja2_compare var == "\u00df"', '/', {'var': u'\u00df'}) == True)
#####################################
### key-value parsing