tests/integration/targets/mount/tasks/main.yml

@@ -134,7 +134,7 @@
   register: bind_result_freebsd_dry_run
   check_mode: true
 
-- name: Attempt to stat bind mounted file
+- name: attempt to stat bind mounted file
   ansible.builtin.stat:
     path: '{{ output_dir }}/mount_dest/test_file'
   when: ansible_system in ('FreeBSD', 'Linux')
@@ -143,7 +143,11 @@
 - name: Assert the bind mount did not take place
   ansible.builtin.assert:
     that:
+      - linux_and_changed or freebsd_and_changed
       - not dest_stat['stat']['exists']
+  vars:
+    linux_and_changed: "{{ ansible_system == 'Linux' and bind_result_linux_dry_run['changed'] }}"
+    freebsd_and_changed: "{{ ansible_system == 'FreeBSD' and bind_result_freebsd['changed'] }}"
   when: ansible_system in ('FreeBSD', 'Linux')
 
 # bind mount
@@ -326,12 +330,12 @@
   when: ansible_system in ('FreeBSD', 'Linux')
 
 # SWAP #############################################################
-- name: Swap
+- name: swap
   when: ansible_system in ('Linux')
   block:
     # mount swap check mode
     - name: Stat /etc/fstab
-      ansible.builtin.stat:
+      stat:
         path: /etc/fstab
       register: stat_fstab_before
 
@@ -345,7 +349,7 @@
       check_mode: true
 
     - name: Stat /etc/fstab
-      ansible.builtin.stat:
+      stat:
         path: /etc/fstab
       register: stat_fstab_after
 
@@ -406,7 +410,7 @@
 
     # remove swap check mode
     - name: Stat /etc/fstab
-      ansible.builtin.stat:
+      stat:
         path: /etc/fstab
       register: stat_fstab_before
 
@@ -418,7 +422,7 @@
       check_mode: true
 
     - name: Stat /etc/fstab
-      ansible.builtin.stat:
+      stat:
         path: /etc/fstab
       register: stat_fstab_after
 
@@ -470,7 +474,7 @@
           - not swap2_removed_again['changed']
 
 # FIXUP #############################################################
-- name: Fix incomplete entry already present in fstab
+- name: fix incomplete entry already present in fstab
   when: ansible_system == 'Linux'
   block:
     - name: Create fstab record with missing last two fields
@@ -830,7 +834,7 @@
       failed_when: false
       changed_when: false
 
-    - name: Assert the mount occurred and the fstab is unchanged
+    - name: Assert the mount occured and the fstab is unchanged
       ansible.builtin.assert:
         that:
           - check_mountinfo.stdout|int == 0