Preserve all line breaks in literal blocks

Fixes #8512
This commit is contained in:
James Cammarata 2014-08-08 11:54:38 -05:00
commit 63bf2f6d9a
4 changed files with 35 additions and 12 deletions

View file

@ -170,14 +170,17 @@
- "shell_result4.changed == False"
- name: execute a shell command using a literal multiline block
args:
executable: /bin/bash
shell: |
echo this is a
"multiline echo"
"with a new line
in quotes"
| md5sum
| tr -s ' '
in quotes" \
| md5sum \
| tr -s ' ' \
| cut -f1 -d ' '
echo "this is a second line"
register: shell_result5
- debug: var=shell_result5
@ -186,5 +189,5 @@
assert:
that:
- "shell_result5.changed"
- "shell_result5.stdout == '32f3cc201b69ed8afa3902b80f554ca8'"
- "shell_result5.stdout == '32f3cc201b69ed8afa3902b80f554ca8\nthis is a second line'"

View file

@ -705,9 +705,9 @@ class TestUtils(unittest.TestCase):
# jinja2 loop blocks with lots of complexity
_test_combo(
# in memory of neighbors cat
# we only preserve newlines inside of quotes
'a {% if x %} y {%else %} {{meow}} {% endif %} "cookie\nchip"\ndone',
['a', '{% if x %}', 'y', '{%else %}', '{{meow}}', '{% endif %}', '"cookie\nchip"', 'done']
# we preserve line breaks unless a line continuation character preceeds them
'a {% if x %} y {%else %} {{meow}} {% endif %} "cookie\nchip" \\\ndone\nand done',
['a', '{% if x %}', 'y', '{%else %}', '{{meow}}', '{% endif %}', '"cookie\nchip"', 'done', '\nand', 'done']
)
# test space preservation within quotes