mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-10-24 13:04:00 -07:00
template: fix KeyError: 'undefined variable: 0 (#27972)
* template: fix KeyError: 'undefined variable: 0
For compatibility with the Context.get_all() implementation
in jinja 2.9, make AnsibleJ2Vars implement collections.Mapping.
Also, make AnsibleJ2Template.newcontext() handle dict type
for the 'vars' parameter.
See: d67f0fd4cc
Fixes: https://github.com/ansible/ansible/issues/20494
* add units/template/test_vars
* intg tests for jinja-2.9 issues like 20494
test cases here are based on
https://github.com/ansible/ansible/issues/20494#issue-202108318
This commit is contained in:
parent
49aa64a5b8
commit
501fc7a248
13 changed files with 160 additions and 2 deletions
|
|
@ -0,0 +1,3 @@
|
|||
hello world import as
|
||||
WIBBLE
|
||||
Goodbye
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
hello world as qux with context
|
||||
WIBBLE
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
hello world with context
|
||||
WIBBLE
|
||||
Goodbye
|
||||
|
|
@ -51,6 +51,60 @@
|
|||
that:
|
||||
- "template_result.changed == true"
|
||||
|
||||
# test for import with context on jinja-2.9 See https://github.com/ansible/ansible/issues/20494
|
||||
- name: fill in a template using import with context ala issue 20494
|
||||
template: src=import_with_context.j2 dest={{output_dir}}/import_with_context.templated mode=0644
|
||||
register: template_result
|
||||
|
||||
- name: copy known good import_with_context.expected into place
|
||||
copy: src=import_with_context.expected dest={{output_dir}}/import_with_context.expected
|
||||
|
||||
- name: compare templated file to known good import_with_context
|
||||
shell: diff -uw {{output_dir}}/import_with_context.templated {{output_dir}}/import_with_context.expected
|
||||
register: diff_result
|
||||
|
||||
- name: verify templated import_with_context matches known good
|
||||
assert:
|
||||
that:
|
||||
- 'diff_result.stdout == ""'
|
||||
- "diff_result.rc == 0"
|
||||
|
||||
# test for 'import as' on jinja-2.9 See https://github.com/ansible/ansible/issues/20494
|
||||
- name: fill in a template using import as ala fails2 case in issue 20494
|
||||
template: src=import_as.j2 dest={{output_dir}}/import_as.templated mode=0644
|
||||
register: import_as_template_result
|
||||
|
||||
- name: copy known good import_as.expected into place
|
||||
copy: src=import_as.expected dest={{output_dir}}/import_as.expected
|
||||
|
||||
- name: compare templated file to known good import_as
|
||||
shell: diff -uw {{output_dir}}/import_as.templated {{output_dir}}/import_as.expected
|
||||
register: import_as_diff_result
|
||||
|
||||
- name: verify templated import_as matches known good
|
||||
assert:
|
||||
that:
|
||||
- 'import_as_diff_result.stdout == ""'
|
||||
- "import_as_diff_result.rc == 0"
|
||||
|
||||
# test for 'import as with context' on jinja-2.9 See https://github.com/ansible/ansible/issues/20494
|
||||
- name: fill in a template using import as with context ala fails2 case in issue 20494
|
||||
template: src=import_as_with_context.j2 dest={{output_dir}}/import_as_with_context.templated mode=0644
|
||||
register: import_as_with_context_template_result
|
||||
|
||||
- name: copy known good import_as_with_context.expected into place
|
||||
copy: src=import_as_with_context.expected dest={{output_dir}}/import_as_with_context.expected
|
||||
|
||||
- name: compare templated file to known good import_as_with_context
|
||||
shell: diff -uw {{output_dir}}/import_as_with_context.templated {{output_dir}}/import_as_with_context.expected
|
||||
register: import_as_with_context_diff_result
|
||||
|
||||
- name: verify templated import_as_with_context matches known good
|
||||
assert:
|
||||
that:
|
||||
- 'import_as_with_context_diff_result.stdout == ""'
|
||||
- "import_as_with_context_diff_result.rc == 0"
|
||||
|
||||
# VERIFY CONTENTS
|
||||
|
||||
- name: check what python version ansible is running on
|
||||
|
|
|
|||
1
test/integration/targets/template/templates/bar
Normal file
1
test/integration/targets/template/templates/bar
Normal file
|
|
@ -0,0 +1 @@
|
|||
Goodbye
|
||||
4
test/integration/targets/template/templates/import_as.j2
Normal file
4
test/integration/targets/template/templates/import_as.j2
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
{% import 'qux' as qux %}
|
||||
hello world import as
|
||||
{{ qux.wibble }}
|
||||
{% include 'bar' %}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{% import 'qux' as qux with context %}
|
||||
hello world as qux with context
|
||||
{{ qux.wibble }}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{% import 'qux' as qux with context %}
|
||||
hello world as qux with context
|
||||
{{ qux.wibble }}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
{% import 'qux' as qux with context %}
|
||||
hello world with context
|
||||
{{ qux.wibble }}
|
||||
{% include 'bar' %}
|
||||
1
test/integration/targets/template/templates/qux
Normal file
1
test/integration/targets/template/templates/qux
Normal file
|
|
@ -0,0 +1 @@
|
|||
{% set wibble = "WIBBLE" %}
|
||||
|
|
@ -18,3 +18,64 @@
|
|||
# Make coding more python3-ish
|
||||
from __future__ import (absolute_import, division, print_function)
|
||||
__metaclass__ = type
|
||||
|
||||
from ansible.compat.tests import unittest
|
||||
from ansible.compat.tests.mock import MagicMock
|
||||
|
||||
from ansible.template.vars import AnsibleJ2Vars
|
||||
|
||||
|
||||
class TestVars(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.mock_templar = MagicMock(name='mock_templar')
|
||||
|
||||
def test(self):
|
||||
ajvars = AnsibleJ2Vars(None, None)
|
||||
print(ajvars)
|
||||
|
||||
def test_globals_empty_2_8(self):
|
||||
ajvars = AnsibleJ2Vars(self.mock_templar, {})
|
||||
res28 = self._dict_jinja28(ajvars)
|
||||
self.assertIsInstance(res28, dict)
|
||||
|
||||
def test_globals_empty_2_9(self):
|
||||
ajvars = AnsibleJ2Vars(self.mock_templar, {})
|
||||
res29 = self._dict_jinja29(ajvars)
|
||||
self.assertIsInstance(res29, dict)
|
||||
|
||||
def _assert_globals(self, res):
|
||||
self.assertIsInstance(res, dict)
|
||||
self.assertIn('foo', res)
|
||||
self.assertEqual(res['foo'], 'bar')
|
||||
|
||||
def test_globals_2_8(self):
|
||||
ajvars = AnsibleJ2Vars(self.mock_templar, {'foo': 'bar', 'blip': [1, 2, 3]})
|
||||
res28 = self._dict_jinja28(ajvars)
|
||||
self._assert_globals(res28)
|
||||
|
||||
def test_globals_2_9(self):
|
||||
ajvars = AnsibleJ2Vars(self.mock_templar, {'foo': 'bar', 'blip': [1, 2, 3]})
|
||||
res29 = self._dict_jinja29(ajvars)
|
||||
self._assert_globals(res29)
|
||||
|
||||
def _dicts(self, ajvars):
|
||||
print(ajvars)
|
||||
res28 = self._dict_jinja28(ajvars)
|
||||
res29 = self._dict_jinja29(ajvars)
|
||||
# res28_other = self._dict_jinja28(ajvars, {'other_key': 'other_value'})
|
||||
# other = {'other_key': 'other_value'}
|
||||
# res29_other = self._dict_jinja29(ajvars, *other)
|
||||
print('res28: %s' % res28)
|
||||
print('res29: %s' % res29)
|
||||
# print('res28_other: %s' % res28_other)
|
||||
# print('res29_other: %s' % res29_other)
|
||||
# return (res28, res29, res28_other, res29_other)
|
||||
# assert ajvars == res28
|
||||
# assert ajvars == res29
|
||||
return (res28, res29)
|
||||
|
||||
def _dict_jinja28(self, *args, **kwargs):
|
||||
return dict(*args, **kwargs)
|
||||
|
||||
def _dict_jinja29(self, the_vars):
|
||||
return dict(the_vars)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue