Skip to content

Commit b897a31

Browse files
committed
test: ensure role gathers the facts it uses by having test clear_facts before include_role
The role gathers the facts it uses. For example, if the user uses `ANSIBLE_GATHERING=explicit`, the role uses the `setup` module with the facts and subsets it requires. This change allows us to test this. Before every role invocation, the test will use `meta: clear_facts` so that the role starts with no facts. Create a task file tests/tasks/run_role_with_clear_facts.yml to do the tasks to clear the facts and run the role. Note that this means we don't need to use `gather_facts` for the tests. Some vars defined using `ansible_facts` have been changed to be defined with `set_fact` instead. This is because of the fact that `vars` are lazily evaluated - the var might be referenced when the facts have been cleared, and will issue an error like `ansible_facts["distribution"] is undefined`. This is typically done for blocks that have a `when` condition that uses `ansible_facts` and the block has a role invocation using run_role_with_clear_facts.yml These have been rewritten to define the `when` condition using `set_fact`. This is because the `when` condition is evaluated every time a task is invoked in the block, and if the facts are cleared, this will raise an undefined variable error. Signed-off-by: Rich Megginson <rmeggins@redhat.com>
1 parent 45deef3 commit b897a31

17 files changed

Lines changed: 111 additions & 66 deletions

tests/tasks/cleanup.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
- name: Reset settings and provider to os default
3-
include_role:
4-
name: linux-system-roles.timesync
3+
include_tasks: tasks/run_role_with_clear_facts.yml
54
vars:
5+
__sr_public: true
66
timesync_ntp_provider: "{{ timesync_ntp_provider_os_default }}"
77
timesync_ptp_domains: []
88
timesync_ntp_servers: []
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
---
2+
# Task file: clear_facts, run linux-system-roles.timesync.
3+
# Include this with include_tasks or import_tasks
4+
# Input:
5+
# - __sr_tasks_from: tasks_from to run - same as tasks_from in include_role
6+
# - __sr_public: export private vars from role - same as public in include_role
7+
# - __sr_failed_when: set to false to ignore role errors - same as failed_when in include_role
8+
- name: Clear facts
9+
meta: clear_facts
10+
11+
# note that you can use failed_when with import_role but not with include_role
12+
# so this simulates the __sr_failed_when false case
13+
# Q: Why do we need a separate task to run the role normally? Why not just
14+
# run the role in the block and rethrow the error in the rescue block?
15+
# A: Because you cannot rethrow the error in exactly the same way as the role does.
16+
# It might be possible to exactly reconstruct ansible_failed_result but it's not worth the effort.
17+
- name: Run the role with __sr_failed_when false
18+
when:
19+
- __sr_failed_when is defined
20+
- not __sr_failed_when
21+
block:
22+
- name: Run the role
23+
include_role:
24+
name: linux-system-roles.timesync
25+
tasks_from: "{{ __sr_tasks_from | default('main') }}"
26+
public: "{{ __sr_public | default(false) }}"
27+
rescue:
28+
- name: Ignore the failure when __sr_failed_when is false
29+
debug:
30+
msg: Ignoring failure when __sr_failed_when is false
31+
32+
- name: Run the role normally
33+
include_role:
34+
name: linux-system-roles.timesync
35+
tasks_from: "{{ __sr_tasks_from | default('main') }}"
36+
public: "{{ __sr_public | default(false) }}"
37+
when: __sr_failed_when | d(true)

tests/tasks/setup.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828
__required_facts: "{{ __timesync_required_facts + ['default_ipv4'] }}"
2929
__required_facts_subsets: "{{ ['!all', '!min'] + __required_facts }}"
3030

31+
# This var is used in several tests and must be a fact not a var due
32+
# to the clear_facts task.
33+
- name: Set var for default_ipv4 interface fact
34+
set_fact:
35+
__timesync_default_ipv4_interface: "{{ ansible_facts['default_ipv4']['interface'] }}"
36+
3137
- name: Debug
3238
debug:
3339
msg: facts {{ ansible_facts | to_nice_json }}

tests/tests_chrony.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
tasks:
2424
- name: Run the role
25-
include_role:
26-
name: linux-system-roles.timesync
27-
public: true
25+
include_tasks: tasks/run_role_with_clear_facts.yml
26+
vars:
27+
__sr_public: true
2828
when: not __bootc_validation | d(false)
2929

3030
- name: Run the role only to get vars needed for validation

tests/tests_default.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Ensure that the role runs with default parameters
33
hosts: all
4-
gather_facts: false
5-
roles:
6-
- linux-system-roles.timesync
4+
tasks:
5+
- name: Run linux-system-roles.timesync
6+
include_tasks: tasks/run_role_with_clear_facts.yml

tests/tests_default_vars.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
hosts: all
44
tasks:
55
- name: Include the timesync role
6-
include_role:
7-
name: linux-system-roles.timesync
8-
public: true
6+
include_tasks: tasks/run_role_with_clear_facts.yml
7+
vars:
8+
__sr_public: true
99

1010
- name: Check that public vars are defined
1111
assert:

tests/tests_ntp.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
timesync_ntp_hwts_interfaces: ["*"]
2525
tasks:
2626
- name: Run the role
27-
include_role:
28-
name: linux-system-roles.timesync
29-
public: true
27+
include_tasks: tasks/run_role_with_clear_facts.yml
28+
vars:
29+
__sr_public: true
3030

3131
- name: Run test
3232
tags: tests::verify

tests/tests_ntp_provider1.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
vars:
55
timesync_ntp_servers:
66
- hostname: 172.16.123.1
7-
roles:
8-
- linux-system-roles.timesync
97

108
pre_tasks:
119
- name: Common test setup tasks
@@ -25,6 +23,10 @@
2523
- chrony
2624
- ntp
2725

26+
tasks:
27+
- name: Run linux-system-roles.timesync
28+
include_tasks: tasks/run_role_with_clear_facts.yml
29+
2830
post_tasks:
2931
- name: Verify provider is working
3032
tags: tests::verify

tests/tests_ntp_provider2.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
vars:
55
timesync_ntp_servers:
66
- hostname: 172.16.123.1
7-
roles:
8-
- linux-system-roles.timesync
97

108
pre_tasks:
119
- name: Common test setup tasks
@@ -39,6 +37,10 @@
3937
state: "{{ 'started' if __timesync_is_booted else omit }}"
4038
enabled: true
4139

40+
tasks:
41+
- name: Run linux-system-roles.timesync
42+
include_tasks: tasks/run_role_with_clear_facts.yml
43+
4244
post_tasks:
4345
- name: Verify chronyd running
4446
tags: tests::verify

tests/tests_ntp_provider3.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
vars:
55
timesync_ntp_servers:
66
- hostname: 172.16.123.1
7-
roles:
8-
- linux-system-roles.timesync
97

108
pre_tasks:
119
- name: Common test setup tasks
@@ -39,6 +37,10 @@
3937
state: "{{ 'started' if __timesync_is_booted else omit }}"
4038
enabled: true
4139

40+
tasks:
41+
- name: Run linux-system-roles.timesync
42+
include_tasks: tasks/run_role_with_clear_facts.yml
43+
4244
post_tasks:
4345
- name: Verify ntpd is running
4446
tags: tests::verify

0 commit comments

Comments
 (0)