mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Change $FILE{} and $PIPE{} to $FILE() and $PIPE()
This commit is contained in:
parent
cc948f339c
commit
4ded8cb3b3
2 changed files with 3 additions and 3 deletions
|
@ -220,7 +220,7 @@ def varReplace(raw, vars):
|
||||||
|
|
||||||
return ''.join(done)
|
return ''.join(done)
|
||||||
|
|
||||||
_FILEPIPECRE = re.compile(r"\$(?P<special>FILE|PIPE)\{([^\}]+)\}")
|
_FILEPIPECRE = re.compile(r"\$(?P<special>FILE|PIPE)\(([^\}]+)\)")
|
||||||
def varReplaceFilesAndPipes(basedir, raw):
|
def varReplaceFilesAndPipes(basedir, raw):
|
||||||
done = [] # Completed chunks to return
|
done = [] # Completed chunks to return
|
||||||
|
|
||||||
|
|
|
@ -214,14 +214,14 @@ class TestUtils(unittest.TestCase):
|
||||||
assert res == u'hello oh great one'
|
assert res == u'hello oh great one'
|
||||||
|
|
||||||
def test_varReplace_include(self):
|
def test_varReplace_include(self):
|
||||||
template = 'hello $FILE{world}'
|
template = 'hello $FILE(world)'
|
||||||
|
|
||||||
res = ansible.utils.template("test", template, {})
|
res = ansible.utils.template("test", template, {})
|
||||||
|
|
||||||
assert res == u'hello world\n'
|
assert res == u'hello world\n'
|
||||||
|
|
||||||
def test_varReplace_include_script(self):
|
def test_varReplace_include_script(self):
|
||||||
template = 'hello $PIPE{echo world}'
|
template = 'hello $PIPE(echo world)'
|
||||||
|
|
||||||
res = ansible.utils.template("test", template, {})
|
res = ansible.utils.template("test", template, {})
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue