mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Fix diy callback tests. (#841)
This commit is contained in:
parent
19b1a0049b
commit
e5d15a56c3
1 changed files with 21 additions and 8 deletions
|
@ -263,7 +263,11 @@
|
||||||
"\u001b[0;32mok: [testhost] => (item=sample item 3) => {\u001b[0m",
|
"\u001b[0;32mok: [testhost] => (item=sample item 3) => {\u001b[0m",
|
||||||
"\u001b[0;32m \"msg\": \"sample debug msg sample item 3\"\u001b[0m",
|
"\u001b[0;32m \"msg\": \"sample debug msg sample item 3\"\u001b[0m",
|
||||||
"\u001b[0;32m}\u001b[0m",
|
"\u001b[0;32m}\u001b[0m",
|
||||||
|
[
|
||||||
|
# Apparently a bug was fixed in Ansible, as before it ran through with "All items completed"
|
||||||
"\u001b[0;31mfatal: [testhost]: FAILED! => {\"msg\": \"All items completed\"}\u001b[0m",
|
"\u001b[0;31mfatal: [testhost]: FAILED! => {\"msg\": \"All items completed\"}\u001b[0m",
|
||||||
|
"\u001b[0;31mfatal: [testhost]: FAILED! => {\"msg\": \"One or more items failed\"}\u001b[0m",
|
||||||
|
],
|
||||||
"\u001b[0;36m...ignoring\u001b[0m",
|
"\u001b[0;36m...ignoring\u001b[0m",
|
||||||
"",
|
"",
|
||||||
"PLAY RECAP *********************************************************************",
|
"PLAY RECAP *********************************************************************",
|
||||||
|
@ -491,7 +495,7 @@
|
||||||
|
|
||||||
- name: Assert test output equals expected output
|
- name: Assert test output equals expected output
|
||||||
assert:
|
assert:
|
||||||
that: result.output.got == result.output.expected
|
that: result.output.differences | length == 0
|
||||||
loop: "{{ results }}"
|
loop: "{{ results }}"
|
||||||
loop_control:
|
loop_control:
|
||||||
loop_var: result
|
loop_var: result
|
||||||
|
@ -504,14 +508,23 @@
|
||||||
{%- set differences = [] -%}
|
{%- set differences = [] -%}
|
||||||
{%- for i in range([result.test.expected_output | count, result.stdout_lines | count] | max) -%}
|
{%- for i in range([result.test.expected_output | count, result.stdout_lines | count] | max) -%}
|
||||||
{%- set line = "line_%s" | format(i+1) -%}
|
{%- set line = "line_%s" | format(i+1) -%}
|
||||||
{%- set expected_line = result.test.expected_output[i] | default(none) -%}
|
|
||||||
{%- set test_line = result.stdout_lines[i] | default(none) -%}
|
{%- set test_line = result.stdout_lines[i] | default(none) -%}
|
||||||
{%- if expected_line != test_line -%}
|
{%- set expected_lines = result.test.expected_output[i] | default(none) -%}
|
||||||
|
{%- if expected_lines is not string -%}
|
||||||
|
{%- if test_line not in expected_lines -%}
|
||||||
|
{{- differences.append({
|
||||||
|
line: {
|
||||||
|
'expected_one_of': expected_lines,
|
||||||
|
'got': test_line }}) -}}
|
||||||
|
{%- endif -%}
|
||||||
|
{%- else -%}
|
||||||
|
{%- if expected_lines != test_line -%}
|
||||||
{{- differences.append({
|
{{- differences.append({
|
||||||
line: {
|
line: {
|
||||||
'expected': expected_line,
|
'expected': expected_line,
|
||||||
'got': test_line }}) -}}
|
'got': test_line }}) -}}
|
||||||
{%- endif -%}
|
{%- endif -%}
|
||||||
|
{%- endif -%}
|
||||||
{%- endfor -%}
|
{%- endfor -%}
|
||||||
{{- results.append({
|
{{- results.append({
|
||||||
'name': result.test.name,
|
'name': result.test.name,
|
||||||
|
|
Loading…
Reference in a new issue