archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix fact gathering intg test asserts (#18168)

Browse Source 
If the facts returned by setup included strings that
had double quotes in them, the asserts in test_gathering_facts.yml
would fail with errors like:

    "The conditional check '\"[{u'mounts': {u'options':
    u'rw,context=\"system_u:\"'}}]\" != \"UNDEF_HW\"' failed. The error was:
    template error while templating string: expected token 'end of statement
    block', got 'system_u'. String: {% if \"[{u'mounts': {u'options':
    u'rw,context=\"system_u:\"'}}]\" != \"UNDEF_HW\" %} True {% else %}
    False {% endif %}"

For one example, if mount facts returned an 'options' field that
included double quoated selinux context ids, the test would fail.

Fix is removing the double quoting in the assert 'that:' lines,
and removing the unneeded double curly brackets.
pull/18254/head
Adrian Likins 8 years ago committed by GitHub
parent d59034ca68
commit 0a1f391881
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File

73
test/integration/targets/gathering_facts/test_gathering_facts.yml
Unescape Escape View File

@ -8,14 +8,13 @@
tasks: tasks:
- setup: - setup:
register: facts register: facts
- debug: var=facts
- name: Test that retrieving all facts works - name: Test that retrieving all facts works
assert: assert:
that: that:
- '"{{ ansible_user_id|default("UNDEF_MIN") }}" != "UNDEF_MIN"' - 'ansible_user_id|default("UNDEF_MIN") != "UNDEF_MIN"'
- '"{{ ansible_interfaces|default("UNDEF_NET") }}" != "UNDEF_NET"' - 'ansible_interfaces|default("UNDEF_NET") != "UNDEF_NET"'
- '"{{ ansible_mounts|default("UNDEF_HW") }}" != "UNDEF_HW"' - 'ansible_mounts|default("UNDEF_NET") != "UNDEF_HW"'
- '"{{ ansible_virtualization_role|default("UNDEF_VIRT") }}" != "UNDEF_VIRT"' - 'ansible_virtualization_role|default("UNDEF_VIRT") != "UNDEF_VIRT"'
- hosts: facthost1 - hosts: facthost1
tags: [ 'fact_min' ] tags: [ 'fact_min' ]
@ -26,10 +25,10 @@
- name: Test that only retrieving minimal facts work - name: Test that only retrieving minimal facts work
assert: assert:
that: that:
- '"{{ ansible_user_id|default("UNDEF_MIN") }}" != "UNDEF_MIN"' - 'ansible_user_id|default("UNDEF_MIN") != "UNDEF_MIN"'
- '"{{ ansible_interfaces|default("UNDEF_NET") }}" == "UNDEF_NET"' - 'ansible_interfaces|default("UNDEF_NET") == "UNDEF_NET"'
- '"{{ ansible_mounts|default("UNDEF_HW") }}" == "UNDEF_HW"' - 'ansible_mounts|default("UNDEF_HW") == "UNDEF_HW"'
- '"{{ ansible_virtualization_role|default("UNDEF_VIRT") }}" == "UNDEF_VIRT"' - 'ansible_virtualization_role|default("UNDEF_VIRT") == "UNDEF_VIRT"'
- hosts: facthost2 - hosts: facthost2
tags: [ 'fact_network' ] tags: [ 'fact_network' ]
@ -40,10 +39,10 @@
- name: Test that retrieving network facts work - name: Test that retrieving network facts work
assert: assert:
that: that:
- '"{{ ansible_user_id|default("UNDEF_MIN") }}" != "UNDEF_MIN"' - 'ansible_user_id|default("UNDEF_MIN") != "UNDEF_MIN"'
- '"{{ ansible_interfaces|default("UNDEF_NET") }}" != "UNDEF_NET"' - 'ansible_interfaces|default("UNDEF_NET") != "UNDEF_NET"'
- '"{{ ansible_mounts|default("UNDEF_HW") }}" == "UNDEF_HW"' - 'ansible_mounts|default("UNDEF_HW") == "UNDEF_HW"'
- '"{{ ansible_virtualization_role|default("UNDEF_VIRT") }}" == "UNDEF_VIRT"' - 'ansible_virtualization_role|default("UNDEF_VIRT") == "UNDEF_VIRT"'
- hosts: facthost3 - hosts: facthost3
tags: [ 'fact_hardware' ] tags: [ 'fact_hardware' ]
@ -54,10 +53,10 @@
- name: Test that retrieving hardware facts work - name: Test that retrieving hardware facts work
assert: assert:
that: that:
- '"{{ ansible_user_id|default("UNDEF_MIN") }}" != "UNDEF_MIN"' - 'ansible_user_id|default("UNDEF_MIN") != "UNDEF_MIN"'
- '"{{ ansible_interfaces|default("UNDEF_NET") }}" == "UNDEF_NET"' - 'ansible_interfaces|default("UNDEF_NET") == "UNDEF_NET"'
- '"{{ ansible_mounts|default("UNDEF_HW") }}" != "UNDEF_HW"' - 'ansible_mounts|default("UNDEF_HW") != "UNDEF_HW"'
- '"{{ ansible_virtualization_role|default("UNDEF_VIRT") }}" == "UNDEF_VIRT"' - 'ansible_virtualization_role|default("UNDEF_VIRT") == "UNDEF_VIRT"'
- hosts: facthost4 - hosts: facthost4
tags: [ 'fact_virtual' ] tags: [ 'fact_virtual' ]
@ -68,10 +67,10 @@
- name: Test that retrieving virtualization facts work - name: Test that retrieving virtualization facts work
assert: assert:
that: that:
- '"{{ ansible_user_id|default("UNDEF_MIN") }}" != "UNDEF_MIN"' - 'ansible_user_id|default("UNDEF_MIN") != "UNDEF_MIN"'
- '"{{ ansible_interfaces|default("UNDEF_NET") }}" == "UNDEF_NET"' - 'ansible_interfaces|default("UNDEF_NET") == "UNDEF_NET"'
- '"{{ ansible_mounts|default("UNDEF_HW") }}" == "UNDEF_HW"' - 'ansible_mounts|default("UNDEF_HW") == "UNDEF_HW"'
- '"{{ ansible_virtualization_role|default("UNDEF_VIRT") }}" != "UNDEF_VIRT"' - 'ansible_virtualization_role|default("UNDEF_VIRT") != "UNDEF_VIRT"'
- hosts: facthost5 - hosts: facthost5
tags: [ 'fact_comma_string' ] tags: [ 'fact_comma_string' ]
@ -82,10 +81,10 @@
- name: Test that retrieving virtualization and network as a string works - name: Test that retrieving virtualization and network as a string works
assert: assert:
that: that:
- '"{{ ansible_user_id|default("UNDEF_MIN") }}" != "UNDEF_MIN"' - 'ansible_user_id|default("UNDEF_MIN") != "UNDEF_MIN"'
- '"{{ ansible_interfaces|default("UNDEF_NET") }}" != "UNDEF_NET"' - 'ansible_interfaces|default("UNDEF_NET") != "UNDEF_NET"'
- '"{{ ansible_mounts|default("UNDEF_HW") }}" == "UNDEF_HW"' - 'ansible_mounts|default("UNDEF_HW") == "UNDEF_HW"'
- '"{{ ansible_virtualization_role|default("UNDEF_VIRT") }}" != "UNDEF_VIRT"' - 'ansible_virtualization_role|default("UNDEF_VIRT") != "UNDEF_VIRT"'
- hosts: facthost6 - hosts: facthost6
tags: [ 'fact_yaml_list' ] tags: [ 'fact_yaml_list' ]
@ -98,10 +97,10 @@
- name: Test that retrieving virtualization and network as a string works - name: Test that retrieving virtualization and network as a string works
assert: assert:
that: that:
- '"{{ ansible_user_id|default("UNDEF_MIN") }}" != "UNDEF_MIN"' - 'ansible_user_id|default("UNDEF_MIN") != "UNDEF_MIN"'
- '"{{ ansible_interfaces|default("UNDEF_NET") }}" != "UNDEF_NET"' - 'ansible_interfaces|default("UNDEF_NET") != "UNDEF_NET"'
- '"{{ ansible_mounts|default("UNDEF_HW") }}" == "UNDEF_HW"' - 'ansible_mounts|default("UNDEF_HW") == "UNDEF_HW"'
- '"{{ ansible_virtualization_role|default("UNDEF_VIRT") }}" != "UNDEF_VIRT"' - 'ansible_virtualization_role|default("UNDEF_VIRT") != "UNDEF_VIRT"'
- hosts: facthost7 - hosts: facthost7
tags: [ 'fact_negation' ] tags: [ 'fact_negation' ]
@ -112,10 +111,10 @@
- name: Test that negation of fact subsets work - name: Test that negation of fact subsets work
assert: assert:
that: that:
- '"{{ ansible_user_id|default("UNDEF_MIN") }}" != "UNDEF_MIN"' - 'ansible_user_id|default("UNDEF_MIN") != "UNDEF_MIN"'
- '"{{ ansible_interfaces|default("UNDEF_NET") }}" != "UNDEF_NET"' - 'ansible_interfaces|default("UNDEF_NET") != "UNDEF_NET"'
- '"{{ ansible_mounts|default("UNDEF_HW") }}" == "UNDEF_HW"' - 'ansible_mounts|default("UNDEF_HW") == "UNDEF_HW"'
- '"{{ ansible_virtualization_role|default("UNDEF_VIRT") }}" != "UNDEF_VIRT"' - 'ansible_virtualization_role|default("UNDEF_VIRT") != "UNDEF_VIRT"'
- hosts: facthost8 - hosts: facthost8
tags: [ 'fact_mixed_negation_addition' ] tags: [ 'fact_mixed_negation_addition' ]
@ -126,8 +125,8 @@
- name: Test that negation and additional subsets work together - name: Test that negation and additional subsets work together
assert: assert:
that: that:
- '"{{ ansible_user_id|default("UNDEF_MIN") }}" != "UNDEF_MIN"' - 'ansible_user_id|default("UNDEF_MIN") != "UNDEF_MIN"'
- '"{{ ansible_interfaces|default("UNDEF_NET") }}" != "UNDEF_NET"' - 'ansible_interfaces|default("UNDEF_NET") != "UNDEF_NET"'
- '"{{ ansible_mounts|default("UNDEF_HW") }}" == "UNDEF_HW"' - 'ansible_mounts|default("UNDEF_HW") == "UNDEF_HW"'
- '"{{ ansible_virtualization_role|default("UNDEF_VIRT") }}" == "UNDEF_VIRT"' - 'ansible_virtualization_role|default("UNDEF_VIRT") == "UNDEF_VIRT"'

Write Preview
Loading…
Cancel
Save