Merge f392e407f9 into 9bfed58f7f

.azure-pipelines/azure-pipelines.yml

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

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.selogin:
+  community.general.system.selogin:
     login: seuser
 - name: Verify failure
   ansible.builtin.assert:
@@ -19,7 +19,7 @@
     - false
     - true
     - false
-  community.general.selogin:
+  community.general.system.selogin:
     login: seuser
     seuser: staff_u
 - name: New mapping- verify functionality and check_mode
@@ -37,7 +37,7 @@
     - false
     - true
     - false
-  community.general.selogin:
+  community.general.system.selogin:
     login: seuser
     seuser: user_u
 - name: Changed mapping- verify functionality and check_mode
@@ -55,7 +55,7 @@
     - false
     - true
     - false
-  community.general.selogin:
+  community.general.system.selogin:
     login: seuser
     state: absent
 - name: Delete mapping- verify functionality and check_mode

tests/unit/compat/mock.py

@@ -64,7 +64,8 @@ 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]
 
-        yield from data_as_list
+        for line in data_as_list:
+            yield line
 
     def mock_open(mock=None, read_data=''):
         """
@@ -92,7 +93,8 @@ 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
-            yield from _data
+            for line in _data:
+                yield line
 
         global file_spec
         if file_spec is None: