Finishing touches on template cleanup.

This commit is contained in:
Michael DeHaan 2013-10-19 11:37:13 -04:00
parent 1e85c7544b
commit 5031104c3a
3 changed files with 71 additions and 47 deletions

View file

@ -9,6 +9,7 @@ from nose.plugins.skip import SkipTest
import ansible.utils
import ansible.utils.template as template2
import ansible.constants as C
class TestUtils(unittest.TestCase):
@ -16,6 +17,10 @@ class TestUtils(unittest.TestCase):
### varReplace function tests
def test_varReplace_var_complex_var(self):
old_setting = C.DEFAULT_LEGACY_PLAYBOOK_VARIABLES
C.DEFAULT_LEGACY_PLAYBOOK_VARIABLES = True
vars = {
'x': '$y',
'y': {
@ -26,6 +31,8 @@ class TestUtils(unittest.TestCase):
res = template2.template(None, template, vars)
assert res == 'result'
C.DEFAULT_LEGACY_PLAYBOOK_VARIABLES = old_setting
#####################################
### template_ds function tests
@ -53,6 +60,9 @@ class TestUtils(unittest.TestCase):
],
}
old_setting = C.DEFAULT_LEGACY_PLAYBOOK_VARIABLES
C.DEFAULT_LEGACY_PLAYBOOK_VARIABLES = True
template = '${data.var}'
res = template2.template(None, template, vars)
assert sorted(res) == sorted(vars['data']['var'])
@ -69,6 +79,8 @@ class TestUtils(unittest.TestCase):
res = template2.template(None, template, vars)
assert res == template
C.DEFAULT_LEGACY_PLAYBOOK_VARIABLES = old_setting
#####################################
### Template function tests