Merge f392e407f9 into 795d8e34e7

ci: replace freebsd 13.2 with 13.3

The devel version of ansible-test has been updated to include support for FreeBSD 13.3, so this change swaps out 13.2 accordingly.
See ansible-collections/news-for-maintainers#67

Reviewed-by: Hideki Saito <saito@fgrep.org>

.azure-pipelines/azure-pipelines.yml

@@ -178,8 +178,8 @@ stages:
           targets:
             - name: RHEL 9.3
               test: rhel/9.3
-            - name: FreeBSD 13.2
+            - name: FreeBSD 13.3
-              test: freebsd/13.2
+              test: freebsd/13.3
   - stage: Remote_2_16
     displayName: Remote 2.16
     dependsOn: []

changelogs/fragments/346-boot-linux.yml

@@ -0,0 +1,3 @@
+---
+bugfix:
+  - mount - Handle ``boot`` option on Linux, NetBSD and OpenBSD correctly (https://github.com/ansible-collections/ansible.posix/issues/364).

plugins/modules/mount.py

@@ -840,9 +840,6 @@ def main():
             args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'noauto'.")
         elif not module.params['boot']:
             args['boot'] = 'no'
-            if 'defaults' in opts:
-                args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'defaults'.")
-            else:
             opts.append('noauto')
             args['opts'] = ','.join(opts)
 

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

@@ -472,6 +472,25 @@
         path: /tmp/myfs
         state: absent
         
+    - name: Mount the FS with noauto option and defaults
+      ansible.posix.mount:
+        path: /tmp/myfs
+        src: /tmp/myfs.img
+        fstype: ext3
+        state: mounted
+        boot: no
+      register: mount_info
+
+    - name: Assert the mount without noauto was successful
+      ansible.builtin.assert:
+        that:
+        - "'noauto' in mount_info['opts'].split(',')"
+
+    - name: Unmount FS
+      ansible.posix.mount:
+        path: /tmp/myfs
+        state: absent
+
     - name: Remove the test FS
       ansible.builtin.file:
         path: '{{ item }}'

tests/integration/targets/selinux/tasks/selogin.yml

@@ -5,7 +5,7 @@
 - name: Attempt to add mapping without 'seuser'
   register: selogin_error
   ignore_errors: true
-  community.general.system.selogin:
+  community.general.selogin:
     login: seuser
 - name: Verify failure
   ansible.builtin.assert:
@@ -19,7 +19,7 @@
     - false
     - true
     - false
-  community.general.system.selogin:
+  community.general.selogin:
     login: seuser
     seuser: staff_u
 - name: New mapping- verify functionality and check_mode
@@ -37,7 +37,7 @@
     - false
     - true
     - false
-  community.general.system.selogin:
+  community.general.selogin:
     login: seuser
     seuser: user_u
 - name: Changed mapping- verify functionality and check_mode
@@ -55,7 +55,7 @@
     - false
     - true
     - false
-  community.general.system.selogin:
+  community.general.selogin:
     login: seuser
     state: absent
 - name: Delete mapping- verify functionality and check_mode

tests/unit/compat/mock.py

@@ -64,8 +64,7 @@ if sys.version_info >= (3,) and sys.version_info < (3, 4, 4):
             # newline that our naive format() added
             data_as_list[-1] = data_as_list[-1][:-1]
 
-        for line in data_as_list:
+        yield from data_as_list
-            yield line
 
     def mock_open(mock=None, read_data=''):
         """
@@ -93,8 +92,7 @@ if sys.version_info >= (3,) and sys.version_info < (3, 4, 4):
             if handle.readline.return_value is not None:
                 while True:
                     yield handle.readline.return_value
-            for line in _data:
+            yield from _data
-                yield line
 
         global file_spec
         if file_spec is None: