Merge d032d13083 into 795d8e34e7

Merge pull request #538 from csmart/ci_freebsd_133
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>
2026-03-09 19:15:19 +01:00 · 2024-03-29 23:13:39 +00:00 · 2024-03-26 06:50:36 +00:00 · 2024-03-26 14:59:32 +09:00 · 2024-03-26 05:51:09 +00:00 · 2024-03-26 13:54:40 +09:00
4 changed files with 16 additions and 11 deletions
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@ -178,8 +178,8 @@ stages:
          targets:
            - name: RHEL 9.3
              test: rhel/9.3
-            - name: FreeBSD 13.2
-              test: freebsd/13.2
+            - name: FreeBSD 13.3
+              test: freebsd/13.3
  - stage: Remote_2_16
    displayName: Remote 2.16
    dependsOn: []
--- a/plugins/action/synchronize.py
+++ b/plugins/action/synchronize.py
@ -77,7 +77,14 @@ class ActionModule(ActionBase):

        if self._host_is_ipv6_address(host):
            return '[%s%s]:%s' % (user_prefix, host, path)
-        return '%s%s:%s' % (user_prefix, host, path)
+
+        # preserve formatting of remote paths if host or user@host is explicitly defined in the path
+        if ':' not in path:
+            return '%s%s:%s' % (user_prefix, host, path)
+        elif '@' not in path:
+            return '%s%s' % (user_prefix, path)
+        else:
+            return path

    def _process_origin(self, host, path, user):

--- a/tests/integration/targets/selinux/tasks/selogin.yml
+++ b/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
--- a/tests/unit/compat/mock.py
+++ b/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 line
+        yield from data_as_list

    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 line
+            yield from _data

        global file_spec
        if file_spec is None:
Author	SHA1	Message	Date
Vasiliy Gokoyev	f57f1a7c93	Merge `d032d13083` into `795d8e34e7`	2024-03-29 23:13:39 +00:00
softwarefactory-project-zuul[bot]	795d8e34e7	Merge pull request #538 from csmart/ci_freebsd_133 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>	2024-03-26 06:50:36 +00:00
Chris Smart	b615d61fae	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.	2024-03-26 14:59:32 +09:00
softwarefactory-project-zuul[bot]	bda85b7453	Merge pull request #541 from saito-hideki/pr/replace_yield [CI] Replaced yield with yield from for sanity test SUMMARY Replaced yield with yield from to address latest sanity test. ISSUE TYPE CI Tests Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2024-03-26 05:51:09 +00:00
Hideki Saito	ac82f575c6	Replaced yield with yield from to address latest sanity test Signed-off-by: Hideki Saito <saito@fgrep.org>	2024-03-26 13:54:40 +09:00
softwarefactory-project-zuul[bot]	a356bdd3c4	Merge pull request #540 from saito-hideki/pr/relace_old_fqcn_selogin [CI] Replaced old selogin FQCN for integration tests SUMMARY Some integration test tasks used the old FQCNs of commuinity.general. This PR will replace old FQCN(community.general.system.selogin)with new cummonity.general.selogin ISSUE TYPE CI Tests Pull Request COMPONENT NAME ansible.posix.selinux ADDITIONAL INFORMATION None	2024-03-26 02:59:55 +00:00
Hideki Saito	4f93234a8b	Replaced old selogin FQCN - FCQN has been changed since comunity.general stable-6 Signed-off-by: Hideki Saito <saito@fgrep.org>	2024-03-26 10:39:34 +09:00
Vasiliy Gokoyev	d032d13083	fix a CI linter issue	2024-01-10 09:55:50 -05:00
k3it	12ecc3823b	maintain proper formating of the remote paths when defined as user@host:/... or host:/... fixes #360	2022-05-14 15:16:03 -04:00