1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Merge branch 'fix-5679' of https://github.com/jirutka/ansible into jirutka-fix-5679

This commit is contained in:
James Cammarata 2014-02-17 14:54:29 -06:00
commit 9c9a940af6
2 changed files with 22 additions and 1 deletions

View file

@ -348,7 +348,11 @@ def main():
if ins_bef is None and ins_aft is None: if ins_bef is None and ins_aft is None:
ins_aft = 'EOF' ins_aft = 'EOF'
present(module, dest, params['regexp'], params['line'], # Replace the newline character with an actual newline. Don't replace
# escaped \\n, hence sub and not str.replace.
line = re.sub(r'\n', os.linesep, params['line'])
present(module, dest, params['regexp'], line,
ins_aft, ins_bef, create, backup, backrefs) ins_aft, ins_bef, create, backup, backrefs)
else: else:
if params['regexp'] is None and params.get('line', None) is None: if params['regexp'] is None and params.get('line', None) is None:

View file

@ -524,6 +524,23 @@ class TestRunner(unittest.TestCase):
result = self._run(*testcase) result = self._run(*testcase)
assert result['failed'] assert result['failed']
# insert multiline at the end of the file
testline1 = '#12: The \\n character replaced with'
testline2 = 'an actual newline.'
testcase = ('lineinfile', [
"dest=%s" % sample,
"regexp='^#12: '",
"line='%s\n%s'" % (testline1, testline2)
])
result = self._run(*testcase)
assert result['changed']
assert result['msg'] == 'line added'
artifact = [x.strip() for x in open(sample)]
assert artifact[-2] == testline1
assert artifact[-1] == testline2
assert artifact.count(testline1) == 1
assert artifact.count(testline2) == 1
# cleanup # cleanup
os.unlink(sample) os.unlink(sample)