Skip to content

Commit b21fd17

Browse files
committed
tests: Adjust for Ansible 2.19
- Avoid `ansible_managed` variable, it's an internal constant. - Eliminate jinja templates in conditions.
1 parent 8d0e6ac commit b21fd17

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

tests/tasks/check_header.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
- name: Check for presence of ansible managed header, fingerprint
1010
assert:
1111
that:
12-
- ansible_managed in content
12+
- __ansible_managed in content
1313
- __fingerprint in content
1414
vars:
1515
content: "{{ (__file_content | d(__content)).content | b64decode }}"
16-
ansible_managed: "{{ lookup('template', 'get_ansible_managed.j2') }}"
16+
__ansible_managed: "{{ lookup('template', 'get_ansible_managed.j2') }}"

tests/tests_default_vars.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@
88
include_role:
99
name: linux-system-roles.nbde_server
1010
public: true
11+
1112
- name: Assert that the role declares all parameters in defaults
1213
assert:
13-
that: "{{ item }} is defined"
14-
loop:
15-
- nbde_server_provider
16-
- nbde_server_deploy_keys
17-
- nbde_server_fetch_keys
18-
- nbde_server_rotate_keys
19-
- nbde_server_keys_dir
14+
that: nbde_server_vars | length == nbde_server_vars_vals | length
15+
vars:
16+
nbde_server_vars:
17+
- nbde_server_provider
18+
- nbde_server_deploy_keys
19+
- nbde_server_fetch_keys
20+
- nbde_server_rotate_keys
21+
- nbde_server_keys_dir
22+
nbde_server_vars_vals: "{{ lookup('vars', *nbde_server_vars) }}"
2023
when: ansible_version.full is version_compare('2.9', '>=')
24+
2125
always:
2226
- name: Cleanup
2327
tags: tests::cleanup

0 commit comments

Comments
 (0)