Revert pull request #1091

Automatic quoting of variables in only_if breaks existing playbooks
where entire statements are put in a variable, and other cases. See
issue #1120 for details.
This commit is contained in:
Daniel Hokka Zakrisson 2012-09-28 13:58:23 +02:00
commit 4b29c2cf74
3 changed files with 4 additions and 70 deletions

View file

@ -202,65 +202,6 @@ class TestUtils(unittest.TestCase):
assert res == 'hello world'
def test_varReplace_repr_basic(self):
vars = {
'color': '$favorite_color',
'favorite_color': 'blue',
}
template = '$color == "blue"'
res = ansible.utils.varReplace(template, vars, do_repr=True)
assert eval(res)
def test_varReplace_repr_varinvar(self):
vars = {
'foo': 'foo',
'bar': 'bar',
'foobar': '$foo$bar',
'var': {
'foo': 'foo',
'foobar': '$foo$bar',
},
}
template = '$foobar == "foobar"'
res = ansible.utils.varReplace(template, vars, do_repr=True)
assert eval(res)
def test_varReplace_repr_varindex(self):
vars = {
'foo': 'foo',
'var': {
'foo': 'bar',
},
}
template = '${var.$foo} == "bar"'
res = ansible.utils.varReplace(template, vars, do_repr=True)
assert eval(res)
def test_varReplace_repr_varpartindex(self):
vars = {
'foo': 'foo',
'var': {
'foobar': 'foobar',
},
}
template = '${var.${foo}bar} == "foobar"'
res = ansible.utils.varReplace(template, vars, do_repr=True)
assert eval(res)
def test_varReplace_repr_nonstr(self):
vars = {
'foo': True,
'bar': 1L,
}
template = '${foo} == $bar'
res = ansible.utils.varReplace(template, vars, do_repr=True)
assert res == 'True == 1L'
def test_varReplace_consecutive_vars(self):
vars = {
'foo': 'foo',