Merge 889ca91b48 into dabaca4b70

Fixes #462 notice permission denied on authorized_key module
2026-05-07 05:43:04 +00:00 · 2025-05-20 10:36:54 +00:00 · 2025-05-20 12:36:42 +02:00
60 changed files with 761 additions and 381 deletions
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -4,12 +4,7 @@
 # SPDX-FileCopyrightText: 2024, Ansible Project

 skip_list:
-  - meta-runtime[unsupported-version]  # This rule doesn't make any sense
+  - meta-runtime[unsupported-version]  # Tis rule doesn't make any sense
  - fqcn[deep]  # This rule produces false positives for files in tests/unit/plugins/action/fixtures/
-  - sanity[cannot-ignore]  # This rule is skipped to keep backward compatibility with Python 2
-
 exclude_paths:
  - changelogs/
-  - .github/
-  - tests/
-  - meta/
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -37,13 +37,13 @@ variables:
 resources:
  containers:
    - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:7.0.0
+      image: quay.io/ansible/azure-pipelines-test-container:6.0.0

 pool: Standard

 stages:
  - stage: Sanity_devel
-    displayName: Ansible devel Sanity & Units & Lint
+    displayName: Ansible devel sanity
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@@ -57,57 +57,8 @@ stages:
              test: units
            - name: Lint
              test: lint
-
-  - stage: Sanity_2_21
-    displayName: Ansible 2.21 Sanity & Units & Lint
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: "{0}"
-          testFormat: 2.21/{0}
-          targets:
-            - name: Sanity
-              test: sanity
-            - name: Units
-              test: units
-            - name: Lint
-              test: lint
-
-  - stage: Sanity_2_20
-    displayName: Ansible 2.20 Sanity & Units & Lint
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: "{0}"
-          testFormat: 2.20/{0}
-          targets:
-            - name: Sanity
-              test: sanity
-            - name: Units
-              test: units
-            - name: Lint
-              test: lint
-
-  - stage: Sanity_2_19
-    displayName: Ansible 2.19 Sanity & Units & Lint
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: "{0}"
-          testFormat: 2.19/{0}
-          targets:
-            - name: Sanity
-              test: sanity
-            - name: Units
-              test: units
-            - name: Lint
-              test: lint
-
  - stage: Sanity_2_18
-    displayName: Ansible 2.18 Sanity & Units & Lint
+    displayName: Ansible 2.18 sanity
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@@ -121,7 +72,47 @@ stages:
              test: units
            - name: Lint
              test: lint
-
+  - stage: Sanity_2_17
+    displayName: Ansible 2.17 sanity
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: "{0}"
+          testFormat: 2.17/{0}
+          targets:
+            - name: Sanity
+              test: sanity
+            - name: Units
+              test: units
+            - name: Lint
+              test: lint
+  - stage: Sanity_2_16
+    displayName: Ansible 2.16 sanity
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: "{0}"
+          testFormat: 2.16/{0}
+          targets:
+            - name: Sanity
+              test: sanity
+            - name: Units
+              test: units
+  - stage: Sanity_2_15
+    displayName: Ansible 2.15 sanity
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: "{0}"
+          testFormat: 2.15/{0}
+          targets:
+            - name: Sanity
+              test: sanity
+            - name: Units
+              test: units
  ## Docker
  - stage: Docker_devel
    displayName: Docker devel
@@ -130,51 +121,6 @@ stages:
      - template: templates/matrix.yml
        parameters:
          testFormat: devel/linux/{0}/1
-          targets:
-            - name: Fedora 44
-              test: fedora44
-            - name: Ubuntu 22.04
-              test: ubuntu2204
-            - name: Ubuntu 24.04
-              test: ubuntu2404
-
-  - stage: Docker_2_21
-    displayName: Docker 2.21
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: devel/linux/{0}/1
-          targets:
-            - name: Fedora 44
-              test: fedora44
-            - name: Ubuntu 22.04
-              test: ubuntu2204
-            - name: Ubuntu 24.04
-              test: ubuntu2404
-
-  - stage: Docker_2_20
-    displayName: Docker 2.20
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.20/linux/{0}/1
-          targets:
-            - name: Fedora 42
-              test: fedora42
-            - name: Ubuntu 22.04
-              test: ubuntu2204
-            - name: Ubuntu 24.04
-              test: ubuntu2404
-
-  - stage: Docker_2_19
-    displayName: Docker 2.19
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.19/linux/{0}/1
          targets:
            - name: Fedora 41
              test: fedora41
@@ -182,7 +128,6 @@ stages:
              test: ubuntu2204
            - name: Ubuntu 24.04
              test: ubuntu2404
-
  - stage: Docker_2_18
    displayName: Docker 2.18
    dependsOn: []
@@ -197,6 +142,49 @@ stages:
              test: ubuntu2204
            - name: Ubuntu 24.04
              test: ubuntu2404
+  - stage: Docker_2_17
+    displayName: Docker 2.17
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.17/linux/{0}/1
+          targets:
+            - name: Fedora 39
+              test: fedora39
+            - name: Ubuntu 22.04
+              test: ubuntu2204
+  - stage: Docker_2_16
+    displayName: Docker 2.16
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.16/linux/{0}/1
+          targets:
+            - name: CentOS 7
+              test: centos7
+            - name: Fedora 38
+              test: fedora38
+            - name: Ubuntu 22.04
+              test: ubuntu2204
+
+  - stage: Docker_2_15
+    displayName: Docker 2.15
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.15/linux/{0}/1
+          targets:
+            - name: CentOS 7
+              test: centos7
+            - name: Fedora 37
+              test: fedora37
+            - name: openSUSE 15 py3
+              test: opensuse15
+            - name: Ubuntu 22.04
+              test: ubuntu2204

  ## Remote
  - stage: Remote_devel
@@ -207,66 +195,12 @@ stages:
        parameters:
          testFormat: devel/{0}/1
          targets:
-            - name: RHEL 10.1
-              test: rhel/10.1
-            - name: RHEL 9.7
-              test: rhel/9.7
-            - name: FreeBSD 14.4
-              test: freebsd/14.4
-            - name: FreeBSD 15.0
-              test: freebsd/15.0
-
-  - stage: Remote_2_21
-    displayName: Remote 2.21
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: devel/{0}/1
-          targets:
-            - name: RHEL 10.1
-              test: rhel/10.1
-            - name: RHEL 9.7
-              test: rhel/9.7
-            - name: FreeBSD 14.4
-              test: freebsd/14.4
-            - name: FreeBSD 15.0
-              test: freebsd/15.0
-
-  - stage: Remote_2_20
-    displayName: Remote 2.20
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.20/{0}/1
-          targets:
-            - name: RHEL 10.1
-              test: rhel/10.1
-            - name: RHEL 9.7
-              test: rhel/9.7
-            - name: FreeBSD 14.3
-              test: freebsd/14.3
-            - name: FreeBSD 13.5
-              test: freebsd/13.5
-
-  - stage: Remote_2_19
-    displayName: Remote 2.19
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.19/{0}/1
-          targets:
-            - name: RHEL 10.1
-              test: rhel/10.1
-            - name: RHEL 9.7
-              test: rhel/9.7
+            - name: RHEL 9.5
+              test: rhel/9.5
            - name: FreeBSD 14.2
              test: freebsd/14.2
            - name: FreeBSD 13.5
              test: freebsd/13.5
-
  - stage: Remote_2_18
    displayName: Remote 2.18
    dependsOn: []
@@ -275,30 +209,67 @@ stages:
        parameters:
          testFormat: 2.18/{0}/1
          targets:
-            - name: RHEL 10.1
-              test: rhel/10.1
-            - name: RHEL 9.7
-              test: rhel/9.7
-            - name: FreeBSD 13.5
-              test: freebsd/13.5
+            - name: RHEL 9.4
+              test: rhel/9.4
+            - name: FreeBSD 13.3
+              test: freebsd/13.3
+  - stage: Remote_2_17
+    displayName: Remote 2.17
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.17/{0}/1
+          targets:
+            - name: RHEL 9.3
+              test: rhel/9.3
+            - name: FreeBSD 13.3
+              test: freebsd/13.3
+  - stage: Remote_2_16
+    displayName: Remote 2.16
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.16/{0}/1
+          targets:
+            - name: RHEL 8.8
+              test: rhel/8.8
+            - name: RHEL 9.2
+              test: rhel/9.2
+
+  - stage: Remote_2_15
+    displayName: Remote 2.15
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.15/{0}/1
+          targets:
+            - name: RHEL 7.9
+              test: rhel/7.9
+            - name: RHEL 8.7
+              test: rhel/8.7
+            - name: RHEL 9.1
+              test: rhel/9.1

  ## Finally

  - stage: Summary
    condition: succeededOrFailed()
    dependsOn:
+      - Sanity_2_15
+      - Remote_2_15
+      - Docker_2_15
+      - Sanity_2_16
+      - Remote_2_16
+      - Docker_2_16
+      - Sanity_2_17
+      - Remote_2_17
+      - Docker_2_17
      - Sanity_2_18
      - Remote_2_18
      - Docker_2_18
-      - Sanity_2_19
-      - Remote_2_19
-      - Docker_2_19
-      - Sanity_2_20
-      - Remote_2_20
-      - Docker_2_20
-      - Sanity_2_21
-      - Remote_2_21
-      - Docker_2_21
      - Sanity_devel
      - Remote_devel
      - Docker_devel
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -0,0 +1,52 @@
+---
+automerge: false
+files:
+  $module_utils/mount.py:
+    labels: mount
+  $modules/acl.py:
+    authors: astorije bcoca
+    labels: acl
+    ignore: astorije
+  $modules/at.py:
+    authors: risaacson
+    labels: at
+  $modules/authorized_key.py:
+    authors: ansible
+    labels: authorized_key
+  $modules/mount.py:
+    authors: ansible skvidal
+    maintainers: jtyr
+    labels: mount
+    ignore: skvidal
+  $modules/patch.py:
+    authors: jirutka luisperlaz
+  $modules/seboolean.py:
+    authors: sfromm
+    labels: seboolean
+  $modules/selinux.py:
+    authors: goozbach
+    maintainers: samdoran
+    labels: selinux
+  $modules/synchronize.py:
+    authors: tima
+    labels: synchronize
+  $modules/sysctl.py:
+    authors: davixx
+    maintainers: Akasurde
+    labels: sysctl
+  $plugins/:
+    labels: profile
+  $plugins/debug.py:
+    labels: debug
+  $plugins/patch.py:
+    labels: patch
+  $plugins/synchronize.py:
+    labels: synchronize
+  $plugins/timer.py:
+macros:
+  actions: plugins/action
+  callbacks: plugins/callback
+  module_utils: plugins/module_utils
+  modules: plugins/modules
+  plugins: plugins/plugins
+  shells: plugins/shell
--- a/.github/workflows/certification.yml
+++ b/.github/workflows/certification.yml
@@ -1,35 +0,0 @@
---
-# This workflow calls the latest version of the
-# reusable workflow.
-# You can copy this file into your respository if
-# you want to check against pinned versions of
-# Automation Hub tests.
-name: Run collection certification checks
-
-on:
-  pull_request:
-    branches: [main]
-  workflow_dispatch:
-  schedule:
-    - cron: '0 6 * * *'
-
-concurrency:
-  group: cert-ver-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-
-# Files that are not related to the core functionality
-# of your collection can cause Ansible Lint to fail.
-# If this happens, add an .ansible-lint file that includes
-# those files and directories to the root of your
-# repository; for example:
-# https://github.com/ansible-collections/partner-certification-checker/blob/main/.ansible-lint
-# https://github.com/ansible-collections/partner-certification-checker/blob/main/.ansible-lint
-
-# If there are sanity test failures that cannot be fixed and are allowed to ignore
-# https://docs.ansible.com/projects/lint/rules/sanity/, create a sanity ignore file
-# https://docs.ansible.com/projects/ansible/devel/dev_guide/testing/sanity/ignores.html#ignore-file-location
-# for each affected version of ansible-core (for example, `tests/sanity/ignore-2.18.txt`) and add corresponding entries.
-jobs:
-  call:
-    uses: ansible-collections/partner-certification-checker/.github/workflows/certification-reusable.yml@v0.1
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 <!-- Add CI and code coverage badges here. Samples included below. -->
 [![Build Status](
 https://dev.azure.com/ansible/ansible.posix/_apis/build/status/CI?branchName=main)](https://dev.azure.com/ansible/ansible.posix/_build?definitionId=26)
-[![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/ansible.posix)](https://codecov.io/gh/ansible-collections/ansible.posix)
+[![Run Status](https://api.shippable.com/projects/5e669aaf8b17a60007e4d18d/badge?branch=main)]() <!--[![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/ansible.posix)](https://codecov.io/gh/ansible-collections/ansible.posix)-->

 ## Communication

@@ -21,7 +21,7 @@ An Ansible Collection of modules and plugins that target POSIX UNIX/Linux and de
 * Python:
  * The Python interpreter version must meet Ansible Core's requirements.
 * Ansible Core:
-  - ansible-core 2.16 or later
+  - ansible-core 2.15 or later

 ## Installation

@@ -46,10 +46,10 @@ To upgrade the collection to the latest available version, run the following com
 ansible-galaxy collection install ansible.posix --upgrade
 ```

-You can also install a specific version of the collection, for example, if you need to downgrade when something is broken in the latest version (please report an issue in this repository). Use the following syntax to install version 2.0.0:
+You can also install a specific version of the collection, for example, if you need to downgrade when something is broken in the latest version (please report an issue in this repository). Use the following syntax to install version 1.0.0:

 ```shell
-ansible-galaxy collection install ansible.posix:==2.0.0
+ansible-galaxy collection install ansible.posix:==1.0.0
 ```

 See [using Ansible collections](https://docs.ansible.com/ansible/devel/user_guide/collections_using.html) for more details.
@@ -78,10 +78,11 @@ ansible-doc -t callback ansible.posix.profile_tasks

 The following ansible-core versions have been tested with this collection:

- ansible-core 2.20 (devel)
- ansible-core 2.19 (stable) *
- ansible-core 2.18 (stable)
+- ansible-core 2.19 (devel)
+- ansible-core 2.18 (stable) *
 - ansible-core 2.17 (stable)
+- ansible-core 2.16 (stable)
+- ansible-core 2.15 (stable)

 ## Contributing

--- a/changelogs/fragments/642_ci_add_rhel10.yml
+++ b/changelogs/fragments/642_ci_add_rhel10.yml
@@ -1,2 +0,0 @@
-trivial:
-  - Add Red Hat Enterprise Linux 10.0 to the CI matrix (https://github.com/ansible-collections/ansible.posix/issues/642).
--- a/changelogs/fragments/650-profile_tasks_roles.yml
+++ b/changelogs/fragments/650-profile_tasks_roles.yml
@@ -1,2 +0,0 @@
-minor_changes:
-  - "profile_tasks and profile_roles callback plugins - avoid deleted/deprecated callback functions, instead use modern interface that was introduced a longer time ago (https://github.com/ansible-collections/ansible.posix/issues/650)."
--- a/changelogs/fragments/654_ci_bump_core_version.yml
+++ b/changelogs/fragments/654_ci_bump_core_version.yml
@@ -1,3 +0,0 @@
---
-trivial:
-  - Bump ansible-core version to 2.20 of devel branch and add 2.19 to CI
--- a/changelogs/fragments/660_ci_azp_syntax.yml
+++ b/changelogs/fragments/660_ci_azp_syntax.yml
@@ -1,2 +0,0 @@
-trivial:
-  - AZP - fixed syntax error in CI test.
--- a/changelogs/fragments/665_update_readme_20250728.yml
+++ b/changelogs/fragments/665_update_readme_20250728.yml
@@ -1,3 +0,0 @@
---
-trivial:
-  - README - Update README to reflect Ansible Core 2.19 release.
--- a/changelogs/fragments/666_azp_update_20250728.yml
+++ b/changelogs/fragments/666_azp_update_20250728.yml
@@ -1,3 +0,0 @@
---
-trivial:
-  - AZP - Update AZP matrix to follow ansible-test changes.
--- a/changelogs/fragments/670-deprecations.yml
+++ b/changelogs/fragments/670-deprecations.yml
@@ -1,3 +0,0 @@
-bugfixes:
-  - "firewalld_info - stop returning warnings as return values; this has been deprecated by ansible-core (https://github.com/ansible-collections/ansible.posix/pull/670)."
-  - "mount - stop returning warnings as return values; this has been deprecated by ansible-core (https://github.com/ansible-collections/ansible.posix/pull/670)."
--- a/changelogs/fragments/673_update_ci_20250805.yml
+++ b/changelogs/fragments/673_update_ci_20250805.yml
@@ -1,2 +0,0 @@
-trivial:
-  - Update AZP CI matrix (https://github.com/ansible-collections/ansible.posix/issues/673).
--- a/changelogs/fragments/682_update_ci_20250929.yml
+++ b/changelogs/fragments/682_update_ci_20250929.yml
@@ -1,4 +0,0 @@
-trivial:
-  - Updatng AZP CI matrix to ignore ansible-bad-import-from on six(https://github.com/ansible-collections/ansible.posix/pull/682).
-  - Skipped sanity[cannot-ignore] to keep backward compatibility with Python2.
-  - Consolidate all ansible-lint option locations into .ansible-lint file.
--- a/changelogs/fragments/686_fix_deprecated_imports.yml
+++ b/changelogs/fragments/686_fix_deprecated_imports.yml
@@ -1,19 +0,0 @@
---
-minor_changes:
-  - acl - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - authorized_key - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - cgroup_perf_recap callback - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - csh shell plugin - fix deprecated ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - firewalld_info - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - fish shell plugin - fix deprecated ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - json callback - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - jsonl callback - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - mount - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - patch - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - profile_roles callback - fix deprecated ``ansible.module_utils.six`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - profile_tasks callback - fix deprecated ``ansible.module_utils.six`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - rhel_rpm_ostree - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - rpm_ostree_upgrade - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - seboolean - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - synchronize - fix deprecated ``ansible.module_utils._text``, ``ansible.module_utils.common._collections_compat``, and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-  - sysctl - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
--- a/changelogs/fragments/693_azp_update_20251205.yml
+++ b/changelogs/fragments/693_azp_update_20251205.yml
@@ -1,5 +0,0 @@
---
-trivial:
-  - AZP - Update AZP matrix to follow ansible-test changes.
-  - Add ignore file for Ansible Core 2.21.
-  - Remove ignore lines for ansible-bad-import-from in 2.20 sanity tests.
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -1,2 +1,2 @@
 ---
-requires_ansible: ">=2.16.0"
+requires_ansible: ">=2.15.0"
--- a/plugins/action/patch.py
+++ b/plugins/action/patch.py
@@ -21,7 +21,7 @@ __metaclass__ = type
 import os

 from ansible.errors import AnsibleError, AnsibleAction, _AnsibleActionDone, AnsibleActionFail
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native
 from ansible.module_utils.parsing.convert_bool import boolean
 from ansible.plugins.action import ActionBase

--- a/plugins/action/synchronize.py
+++ b/plugins/action/synchronize.py
@@ -18,11 +18,12 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

 import os.path
-from collections.abc import MutableSequence
-from shlex import quote as shlex_quote

 from ansible import constants as C
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils.six import string_types
+from ansible.module_utils.six.moves import shlex_quote
+from ansible.module_utils._text import to_text
+from ansible.module_utils.common._collections_compat import MutableSequence
 from ansible.module_utils.parsing.convert_bool import boolean
 from ansible.plugins.action import ActionBase
 from ansible.plugins.loader import connection_loader
@@ -416,7 +417,7 @@ class ActionModule(ActionBase):
            # Replicate what we do in the module argumentspec handling for lists
            if not isinstance(_tmp_args.get('rsync_opts'), MutableSequence):
                tmp_rsync_opts = _tmp_args.get('rsync_opts', [])
-                if isinstance(tmp_rsync_opts, str):
+                if isinstance(tmp_rsync_opts, string_types):
                    tmp_rsync_opts = tmp_rsync_opts.split(',')
                elif isinstance(tmp_rsync_opts, (int, float)):
                    tmp_rsync_opts = [to_text(tmp_rsync_opts)]
--- a/plugins/callback/cgroup_perf_recap.py
+++ b/plugins/callback/cgroup_perf_recap.py
@@ -141,7 +141,8 @@ from abc import ABCMeta, abstractmethod

 from functools import partial

-from ansible.module_utils.common.text.converters import to_bytes, to_text
+from ansible.module_utils._text import to_bytes, to_text
+from ansible.module_utils.six import with_metaclass
 from ansible.parsing.ajson import AnsibleJSONEncoder
 from ansible.plugins.callback import CallbackBase

@@ -157,7 +158,7 @@ def dict_fromkeys(keys, default=None):
    return d


-class BaseProf(threading.Thread, metaclass=ABCMeta):
+class BaseProf(with_metaclass(ABCMeta, threading.Thread)):
    def __init__(self, path, obj=None, writer=None):
        threading.Thread.__init__(self)  # pylint: disable=non-parent-init-called
        self.obj = obj
--- a/plugins/callback/json.py
+++ b/plugins/callback/json.py
@@ -48,7 +48,7 @@ import json
 from functools import partial

 from ansible.inventory.host import Host
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils._text import to_text
 from ansible.parsing.ajson import AnsibleJSONEncoder
 from ansible.plugins.callback import CallbackBase

--- a/plugins/callback/jsonl.py
+++ b/plugins/callback/jsonl.py
@@ -50,7 +50,7 @@ import copy
 from functools import partial

 from ansible.inventory.host import Host
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils._text import to_text
 from ansible.parsing.ajson import AnsibleJSONEncoder
 from ansible.plugins.callback import CallbackBase

--- a/plugins/callback/profile_roles.py
+++ b/plugins/callback/profile_roles.py
@@ -33,7 +33,7 @@ import collections
 import time

 from ansible.plugins.callback import CallbackBase
-from functools import reduce
+from ansible.module_utils.six.moves import reduce

 # define start time
 t0 = tn = time.time()
@@ -124,7 +124,10 @@ class CallbackModule(CallbackBase):
    def v2_playbook_on_handler_task_start(self, task):
        self._record_task(task)

-    def v2_playbook_on_stats(self, stats):
+    def playbook_on_setup(self):
+        self._display_tasktime()
+
+    def playbook_on_stats(self, stats):
        # Align summary report header with other callback plugin summary
        self._display.banner("ROLES RECAP")

--- a/plugins/callback/profile_tasks.py
+++ b/plugins/callback/profile_tasks.py
@@ -86,7 +86,7 @@ import collections

 from datetime import datetime

-from functools import reduce
+from ansible.module_utils.six.moves import reduce
 from ansible.plugins.callback import CallbackBase


@@ -209,7 +209,10 @@ class CallbackModule(CallbackBase):
    def v2_playbook_on_handler_task_start(self, task):
        self._record_task(task)

-    def v2_playbook_on_stats(self, stats):
+    def playbook_on_setup(self):
+        self._display_tasktime()
+
+    def playbook_on_stats(self, stats):
        # Align summary report header with other callback plugin summary
        self._display.banner("TASKS RECAP")

--- a/plugins/modules/acl.py
+++ b/plugins/modules/acl.py
@@ -147,7 +147,7 @@ import os
 import platform

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native


 def split_entry(entry):
--- a/plugins/modules/authorized_key.py
+++ b/plugins/modules/authorized_key.py
@@ -226,20 +226,12 @@ import tempfile
 import re
 import shlex
 import errno
-import traceback
 from operator import itemgetter

-# TODO(Python2): urllib.parse is available in Python 3. This module may run on
-# target hosts with Python 2.7 (e.g., older RHEL systems in CI integration tests).
-# Remove the try/except fallback to urlparse when Python 2 support is dropped.
-try:
-    from urllib.parse import urlparse
-except ImportError:
-    from urlparse import urlparse
-
+from ansible.module_utils._text import to_native
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.text.converters import to_native
 from ansible.module_utils.urls import fetch_url
+from ansible.module_utils.six.moves.urllib.parse import urlparse


 class keydict(dict):
@@ -490,8 +482,7 @@ def readfile(module, filename):
            return f.read()
    except IOError as e:
        if e.errno == errno.EACCES:
-            module.fail_json(msg="Permission denied on file or path for authorized keys file: %s" % filename,
-                             exception=traceback.format_exc())
+            module.fail_json(msg="Permission denied on file or path for authorized keys file: {}".format(filename))
        elif e.errno == errno.ENOENT:
            return ''
        else:
--- a/plugins/modules/firewalld_info.py
+++ b/plugins/modules/firewalld_info.py
@@ -210,7 +210,7 @@ firewalld_info:
 '''

 from ansible.module_utils.basic import AnsibleModule, missing_required_lib
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native
 from ansible_collections.ansible.posix.plugins.module_utils._respawn import respawn_module, HAS_RESPAWN_UTIL
 from ansible_collections.ansible.posix.plugins.module_utils.version import StrictVersion

@@ -319,6 +319,7 @@ def main():
        active_zones=module.params['active_zones'],
        collected_zones=list(),
        undefined_zones=list(),
+        warnings=list(),
    )

    # Exit with failure message if requirements modules are not installed.
--- a/plugins/modules/mount.py
+++ b/plugins/modules/mount.py
@@ -225,7 +225,8 @@ import platform

 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.ansible.posix.plugins.module_utils.mount import ismount
-from ansible.module_utils.common.text.converters import to_bytes, to_native
+from ansible.module_utils.six import iteritems
+from ansible.module_utils._text import to_bytes, to_native
 from ansible.module_utils.parsing.convert_bool import boolean


@@ -278,7 +279,7 @@ def _set_mount_save_old(module, args):
    old_lines = []
    exists = False
    changed = False
-    escaped_args = dict([(k, _escape_fstab(v)) for k, v in args.items()])
+    escaped_args = dict([(k, _escape_fstab(v)) for k, v in iteritems(args) if k != 'warnings'])
    new_line = '%(src)s %(name)s %(fstype)s %(opts)s %(dump)s %(passno)s\n'

    if platform.system() == 'SunOS':
@@ -803,6 +804,7 @@ def main():
            passno='-',
            fstab=module.params['fstab'],
            boot='yes' if module.params['boot'] else 'no',
+            warnings=[]
        )
        if args['fstab'] is None:
            args['fstab'] = '/etc/vfstab'
@@ -814,6 +816,7 @@ def main():
            passno='0',
            fstab=module.params['fstab'],
            boot='yes',
+            warnings=[]
        )
        if args['fstab'] is None:
            args['fstab'] = '/etc/fstab'
@@ -831,7 +834,8 @@ def main():
        linux_mounts = get_linux_mounts(module)

        if linux_mounts is None:
-            module.warn('Cannot open file /proc/self/mountinfo. Bind mounts might be misinterpreted.')
+            args['warnings'].append('Cannot open file /proc/self/mountinfo.'
+                                    ' Bind mounts might be misinterpreted.')

    # Override defaults with user specified params
    for key in ('src', 'fstype', 'passno', 'opts', 'dump', 'fstab'):
@@ -843,7 +847,7 @@ def main():
        # specified in 'opts',  mount module will ignore 'boot'.
        opts = args['opts'].split(',')
        if module.params['boot'] and 'noauto' in opts:
-            module.warn("Ignore the 'boot' due to 'opts' contains 'noauto'.")
+            args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'noauto'.")
        elif not module.params['boot']:
            args['boot'] = 'no'
            opts.append('noauto')
--- a/plugins/modules/patch.py
+++ b/plugins/modules/patch.py
@@ -106,7 +106,7 @@ import os
 import platform
 from traceback import format_exc
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native


 class PatchError(Exception):
--- a/plugins/modules/rhel_rpm_ostree.py
+++ b/plugins/modules/rhel_rpm_ostree.py
@@ -73,7 +73,7 @@ import os
 import traceback

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils._text import to_text


 def locally_installed(module, pkgname):
--- a/plugins/modules/rpm_ostree_upgrade.py
+++ b/plugins/modules/rpm_ostree_upgrade.py
@@ -71,7 +71,7 @@ import os
 import traceback

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.text.converters import to_native, to_text
+from ansible.module_utils._text import to_native, to_text


 def rpm_ostree_transaction(module):
--- a/plugins/modules/seboolean.py
+++ b/plugins/modules/seboolean.py
@@ -73,7 +73,7 @@ except ImportError:
    HAVE_SEMANAGE = False

 from ansible.module_utils.basic import AnsibleModule, missing_required_lib
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils._text import to_text
 from ansible_collections.ansible.posix.plugins.module_utils._respawn import respawn_module, HAS_RESPAWN_UTIL


--- a/plugins/modules/synchronize.py
+++ b/plugins/modules/synchronize.py
@@ -367,16 +367,9 @@ EXAMPLES = r'''
 import os
 import errno

-# TODO(Python2): shlex.quote was added in Python 3.3. This module may run on
-# target hosts with Python 2.7 (e.g., older RHEL systems in CI integration tests).
-# Remove the try/except fallback to pipes.quote when Python 2 support is dropped.
-try:
-    from shlex import quote as shlex_quote
-except ImportError:
-    from pipes import quote as shlex_quote
-
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.text.converters import to_bytes, to_native
+from ansible.module_utils._text import to_bytes, to_native
+from ansible.module_utils.six.moves import shlex_quote


 client_addr = None
--- a/plugins/modules/sysctl.py
+++ b/plugins/modules/sysctl.py
@@ -107,20 +107,12 @@ EXAMPLES = r'''
 import os
 import platform
 import re
-import sys
 import tempfile

-# TODO(Python2): On Python 2, string_types is basestring (str + unicode).
-# This module may run on target hosts with Python 2.7.
-# Remove the Python 2 branch when Python 2 support is dropped.
-if sys.version_info >= (3, 0):
-    string_types = str
-else:
-    string_types = basestring  # pylint: disable=undefined-variable
-
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils.six import string_types
 from ansible.module_utils.parsing.convert_bool import BOOLEANS_FALSE, BOOLEANS_TRUE
+from ansible.module_utils._text import to_native


 class SysctlModule(object):
--- a/plugins/shell/csh.py
+++ b/plugins/shell/csh.py
@@ -13,7 +13,8 @@ DOCUMENTATION = '''
      - shell_common
 '''

-from shlex import quote as shlex_quote
+from ansible.module_utils.six import text_type
+from ansible.module_utils.six.moves import shlex_quote
 from ansible.plugins.shell import ShellBase


@@ -42,5 +43,5 @@ class ShellModule(ShellBase):
        ret = []
        # All the -u options must be first, so we process them first
        ret += ['-u %s' % k for k, v in kwargs.items() if v is None]
-        ret += ['%s=%s' % (k, shlex_quote(str(v))) for k, v in kwargs.items() if v is not None]
+        ret += ['%s=%s' % (k, shlex_quote(text_type(v))) for k, v in kwargs.items() if v is not None]
        return 'env %s' % ' '.join(ret)
--- a/plugins/shell/fish.py
+++ b/plugins/shell/fish.py
@@ -13,7 +13,8 @@ DOCUMENTATION = '''
      - shell_common
 '''

-from shlex import quote as shlex_quote
+from ansible.module_utils.six import text_type
+from ansible.module_utils.six.moves import shlex_quote
 from ansible.plugins.shell.sh import ShellModule as ShModule


@@ -41,7 +42,7 @@ class ShellModule(ShModule):
            if v is None:
                ret.append('set -e %s;' % k)
            else:
-                ret.append('set -lx %s %s;' % (k, shlex_quote(str(v))))
+                ret.append('set -lx %s %s;' % (k, shlex_quote(text_type(v))))
        return ' '.join(ret)

    def build_module_command(self, env_string, shebang, cmd, arg_path=None):
--- a/tests/integration/targets/acl/tasks/acl.yml
+++ b/tests/integration/targets/acl/tasks/acl.yml
@@ -46,12 +46,6 @@
    path: "{{ test_dir }}"
    state: directory
    mode: "0755"
-
- name: Install acl package
-  ansible.builtin.package:
-    name: acl
-    state: present
-
 ##############################################################################
 - name: Grant ansible user read access to a file
  ansible.posix.acl:
--- a/tests/integration/targets/authorized_key/tasks/check_permissions.yml
+++ b/tests/integration/targets/authorized_key/tasks/check_permissions.yml
@@ -1,41 +0,0 @@
---
-# -------------------------------------------------------------
-# check permissions
-
- name: Create a file that is not accessible
-  ansible.builtin.file:
-    state: touch
-    path: "{{ output_dir | expanduser }}/file_permissions"
-    owner: root
-    mode: '0000'
-
- name: Create unprivileged user
-  ansible.builtin.user:
-    name: nopriv
-    create_home: true
-
- name: Try to delete a key from an unreadable file
-  become: true
-  become_user: nopriv
-  ansible.posix.authorized_key:
-    user: root
-    key: "{{ dss_key_basic }}"
-    state: absent
-    path: "{{ output_dir | expanduser }}/file_permissions"
-  register: result
-  ignore_errors: true
-
- name: Assert that the key deletion has failed
-  ansible.builtin.assert:
-    that:
-      - result is failed
-
- name: Remove the file
-  ansible.builtin.file:
-    state: absent
-    path: "{{ output_dir | expanduser }}/file_permissions"
-
- name: Remove the user
-  ansible.builtin.user:
-    name: nopriv
-    state: absent
--- a/tests/integration/targets/authorized_key/tasks/main.yml
+++ b/tests/integration/targets/authorized_key/tasks/main.yml
@@ -34,6 +34,3 @@

 - name: Test for specifying key as a path
  ansible.builtin.import_tasks: check_path.yml
-
- name: Test for permission denied files
-  ansible.builtin.import_tasks: check_permissions.yml
--- a/tests/integration/targets/firewalld/aliases
+++ b/tests/integration/targets/firewalld/aliases
@@ -1,5 +1,3 @@
-needs/privileged
-needs/root
 destructive
 shippable/posix/group1
 skip/aix
--- a/tests/sanity/ignore-2.14.txt
+++ b/tests/sanity/ignore-2.14.txt
@@ -0,0 +1,2 @@
+tests/utils/shippable/check_matrix.py replace-urlopen
+tests/utils/shippable/timing.py shebang
--- a/tests/sanity/ignore-2.15.txt
+++ b/tests/sanity/ignore-2.15.txt
@@ -0,0 +1,2 @@
+tests/utils/shippable/check_matrix.py replace-urlopen
+tests/utils/shippable/timing.py shebang
--- a/tests/sanity/ignore-2.16.txt
+++ b/tests/sanity/ignore-2.16.txt
@@ -0,0 +1 @@
+tests/utils/shippable/timing.py shebang
--- a/tests/sanity/ignore-2.17.txt
+++ b/tests/sanity/ignore-2.17.txt
@@ -0,0 +1 @@
+tests/utils/shippable/timing.py shebang
--- a/tests/sanity/ignore-2.18.txt
+++ b/tests/sanity/ignore-2.18.txt
@@ -0,0 +1 @@
+tests/utils/shippable/timing.py shebang
--- a/tests/sanity/ignore-2.19.txt
+++ b/tests/sanity/ignore-2.19.txt
@@ -0,0 +1 @@
+tests/utils/shippable/timing.py shebang
--- a/tests/sanity/ignore-2.20.txt
+++ b/tests/sanity/ignore-2.20.txt
--- a/tests/sanity/ignore-2.21.txt
+++ b/tests/sanity/ignore-2.21.txt
--- a/tests/sanity/ignore-2.22.txt
+++ b/tests/sanity/ignore-2.22.txt
--- a/tests/unit/compat/builtins.py
+++ b/tests/unit/compat/builtins.py
@@ -0,0 +1,34 @@
+# (c) 2014, Toshio Kuratomi <tkuratomi@ansible.com>
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+#
+# Compat for python2.7
+#
+
+# One unittest needs to import builtins via __import__() so we need to have
+# the string that represents it
+try:
+    import __builtin__
+except ImportError:
+    BUILTINS = 'builtins'
+else:
+    BUILTINS = '__builtin__'
+    __all__ = ['__builtin__']
--- a/tests/unit/mock/loader.py
+++ b/tests/unit/mock/loader.py
@@ -0,0 +1,116 @@
+# (c) 2012-2014, Michael DeHaan <michael.dehaan@gmail.com>
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import os
+
+from ansible.errors import AnsibleParserError
+from ansible.parsing.dataloader import DataLoader
+from ansible.module_utils._text import to_bytes, to_text
+
+
+class DictDataLoader(DataLoader):
+
+    def __init__(self, file_mapping=None):
+        file_mapping = {} if file_mapping is None else file_mapping
+        assert isinstance(file_mapping, dict)
+
+        super(DictDataLoader, self).__init__()
+
+        self._file_mapping = file_mapping
+        self._build_known_directories()
+        self._vault_secrets = None
+
+    def load_from_file(self, path, cache=True, unsafe=False):
+        path = to_text(path)
+        if path in self._file_mapping:
+            return self.load(self._file_mapping[path], path)
+        return None
+
+    # TODO: the real _get_file_contents returns a bytestring, so we actually convert the
+    #       unicode/text it's created with to utf-8
+    def _get_file_contents(self, file_name):
+        path = to_text(file_name)
+        if path in self._file_mapping:
+            return (to_bytes(self._file_mapping[path]), False)
+        else:
+            raise AnsibleParserError("file not found: %s" % path)
+
+    def path_exists(self, path):
+        path = to_text(path)
+        return path in self._file_mapping or path in self._known_directories
+
+    def is_file(self, path):
+        path = to_text(path)
+        return path in self._file_mapping
+
+    def is_directory(self, path):
+        path = to_text(path)
+        return path in self._known_directories
+
+    def list_directory(self, path):
+        ret = []
+        path = to_text(path)
+        for x in (list(self._file_mapping.keys()) + self._known_directories):
+            if x.startswith(path):
+                if os.path.dirname(x) == path:
+                    ret.append(os.path.basename(x))
+        return ret
+
+    def is_executable(self, path):
+        # FIXME: figure out a way to make paths return true for this
+        return False
+
+    def _add_known_directory(self, directory):
+        if directory not in self._known_directories:
+            self._known_directories.append(directory)
+
+    def _build_known_directories(self):
+        self._known_directories = []
+        for path in self._file_mapping:
+            dirname = os.path.dirname(path)
+            while dirname not in ('/', ''):
+                self._add_known_directory(dirname)
+                dirname = os.path.dirname(dirname)
+
+    def push(self, path, content):
+        rebuild_dirs = False
+        if path not in self._file_mapping:
+            rebuild_dirs = True
+
+        self._file_mapping[path] = content
+
+        if rebuild_dirs:
+            self._build_known_directories()
+
+    def pop(self, path):
+        if path in self._file_mapping:
+            del self._file_mapping[path]
+            self._build_known_directories()
+
+    def clear(self):
+        self._file_mapping = dict()
+        self._known_directories = []
+
+    def get_basedir(self):
+        return os.getcwd()
+
+    def set_vault_secrets(self, vault_secrets):
+        self._vault_secrets = vault_secrets
--- a/tests/unit/mock/path.py
+++ b/tests/unit/mock/path.py
@@ -0,0 +1,9 @@
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+from ansible_collections.ansible.posix.tests.unit.compat.mock import MagicMock
+from ansible.utils.path import unfrackpath
+
+
+mock_unfrackpath_noop = MagicMock(spec_set=unfrackpath, side_effect=lambda x, *args, **kwargs: x)
--- a/tests/unit/mock/procenv.py
+++ b/tests/unit/mock/procenv.py
@@ -0,0 +1,90 @@
+# (c) 2016, Matt Davis <mdavis@ansible.com>
+# (c) 2016, Toshio Kuratomi <tkuratomi@ansible.com>
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import sys
+import json
+
+from contextlib import contextmanager
+from io import BytesIO, StringIO
+from ansible_collections.ansible.posix.tests.unit.compat import unittest
+from ansible.module_utils.six import PY3
+from ansible.module_utils._text import to_bytes
+
+
+@contextmanager
+def swap_stdin_and_argv(stdin_data='', argv_data=tuple()):
+    """
+    context manager that temporarily masks the test runner's values for stdin and argv
+    """
+    real_stdin = sys.stdin
+    real_argv = sys.argv
+
+    if PY3:
+        fake_stream = StringIO(stdin_data)
+        fake_stream.buffer = BytesIO(to_bytes(stdin_data))
+    else:
+        fake_stream = BytesIO(to_bytes(stdin_data))
+
+    try:
+        sys.stdin = fake_stream
+        sys.argv = argv_data
+
+        yield
+    finally:
+        sys.stdin = real_stdin
+        sys.argv = real_argv
+
+
+@contextmanager
+def swap_stdout():
+    """
+    context manager that temporarily replaces stdout for tests that need to verify output
+    """
+    old_stdout = sys.stdout
+
+    if PY3:
+        fake_stream = StringIO()
+    else:
+        fake_stream = BytesIO()
+
+    try:
+        sys.stdout = fake_stream
+
+        yield fake_stream
+    finally:
+        sys.stdout = old_stdout
+
+
+class ModuleTestCase(unittest.TestCase):
+    def setUp(self, module_args=None):
+        if module_args is None:
+            module_args = {'_ansible_remote_tmp': '/tmp', '_ansible_keep_remote_files': False}
+
+        args = json.dumps(dict(ANSIBLE_MODULE_ARGS=module_args))
+
+        # unittest doesn't have a clean place to use a context manager, so we have to enter/exit manually
+        self.stdin_swap = swap_stdin_and_argv(stdin_data=args)
+        self.stdin_swap.__enter__()
+
+    def tearDown(self):
+        # unittest doesn't have a clean place to use a context manager, so we have to enter/exit manually
+        self.stdin_swap.__exit__(None, None, None)
--- a/tests/unit/mock/vault_helper.py
+++ b/tests/unit/mock/vault_helper.py
@@ -0,0 +1,39 @@
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+from ansible.module_utils._text import to_bytes
+
+from ansible.parsing.vault import VaultSecret
+
+
+class TextVaultSecret(VaultSecret):
+    '''A secret piece of text. ie, a password. Tracks text encoding.
+
+    The text encoding of the text may not be the default text encoding so
+    we keep track of the encoding so we encode it to the same bytes.'''
+
+    def __init__(self, text, encoding=None, errors=None, _bytes=None):
+        super(TextVaultSecret, self).__init__()
+        self.text = text
+        self.encoding = encoding or 'utf-8'
+        self._bytes = _bytes
+        self.errors = errors or 'strict'
+
+    @property
+    def bytes(self):
+        '''The text encoded with encoding, unless we specifically set _bytes.'''
+        return self._bytes or to_bytes(self.text, encoding=self.encoding, errors=self.errors)
--- a/tests/unit/mock/yaml_helper.py
+++ b/tests/unit/mock/yaml_helper.py
@@ -0,0 +1,125 @@
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+import io
+import yaml
+
+from ansible.module_utils.six import PY3
+from ansible.parsing.yaml.loader import AnsibleLoader
+from ansible.parsing.yaml.dumper import AnsibleDumper
+
+
+class YamlTestUtils(object):
+    """Mixin class to combine with a unittest.TestCase subclass."""
+    def _loader(self, stream):
+        """Vault related tests will want to override this.
+
+        Vault cases should setup a AnsibleLoader that has the vault password."""
+        return AnsibleLoader(stream)
+
+    def _dump_stream(self, obj, stream, dumper=None):
+        """Dump to a py2-unicode or py3-string stream."""
+        if PY3:
+            return yaml.dump(obj, stream, Dumper=dumper)
+        else:
+            return yaml.dump(obj, stream, Dumper=dumper, encoding=None)
+
+    def _dump_string(self, obj, dumper=None):
+        """Dump to a py2-unicode or py3-string"""
+        if PY3:
+            return yaml.dump(obj, Dumper=dumper)
+        else:
+            return yaml.dump(obj, Dumper=dumper, encoding=None)
+
+    def _dump_load_cycle(self, obj):
+        # Each pass though a dump or load revs the 'generation'
+        # obj to yaml string
+        string_from_object_dump = self._dump_string(obj, dumper=AnsibleDumper)
+
+        # wrap a stream/file like StringIO around that yaml
+        stream_from_object_dump = io.StringIO(string_from_object_dump)
+        loader = self._loader(stream_from_object_dump)
+        # load the yaml stream to create a new instance of the object (gen 2)
+        obj_2 = loader.get_data()
+
+        # dump the gen 2 objects directory to strings
+        string_from_object_dump_2 = self._dump_string(obj_2,
+                                                      dumper=AnsibleDumper)
+
+        # The gen 1 and gen 2 yaml strings
+        self.assertEqual(string_from_object_dump, string_from_object_dump_2)
+        # the gen 1 (orig) and gen 2 py object
+        self.assertEqual(obj, obj_2)
+
+        # again! gen 3... load strings into py objects
+        stream_3 = io.StringIO(string_from_object_dump_2)
+        loader_3 = self._loader(stream_3)
+        obj_3 = loader_3.get_data()
+
+        string_from_object_dump_3 = self._dump_string(obj_3, dumper=AnsibleDumper)
+
+        self.assertEqual(obj, obj_3)
+        # should be transitive, but...
+        self.assertEqual(obj_2, obj_3)
+        self.assertEqual(string_from_object_dump, string_from_object_dump_3)
+
+    def _old_dump_load_cycle(self, obj):
+        '''Dump the passed in object to yaml, load it back up, dump again, compare.'''
+        stream = io.StringIO()
+
+        yaml_string = self._dump_string(obj, dumper=AnsibleDumper)
+        self._dump_stream(obj, stream, dumper=AnsibleDumper)
+
+        yaml_string_from_stream = stream.getvalue()
+
+        # reset stream
+        stream.seek(0)
+
+        loader = self._loader(stream)
+        # loader = AnsibleLoader(stream, vault_password=self.vault_password)
+        obj_from_stream = loader.get_data()
+
+        stream_from_string = io.StringIO(yaml_string)
+        loader2 = self._loader(stream_from_string)
+        # loader2 = AnsibleLoader(stream_from_string, vault_password=self.vault_password)
+        obj_from_string = loader2.get_data()
+
+        stream_obj_from_stream = io.StringIO()
+        stream_obj_from_string = io.StringIO()
+
+        if PY3:
+            yaml.dump(obj_from_stream, stream_obj_from_stream, Dumper=AnsibleDumper)
+            yaml.dump(obj_from_stream, stream_obj_from_string, Dumper=AnsibleDumper)
+        else:
+            yaml.dump(obj_from_stream, stream_obj_from_stream, Dumper=AnsibleDumper, encoding=None)
+            yaml.dump(obj_from_stream, stream_obj_from_string, Dumper=AnsibleDumper, encoding=None)
+
+        yaml_string_stream_obj_from_stream = stream_obj_from_stream.getvalue()
+        yaml_string_stream_obj_from_string = stream_obj_from_string.getvalue()
+
+        stream_obj_from_stream.seek(0)
+        stream_obj_from_string.seek(0)
+
+        if PY3:
+            yaml_string_obj_from_stream = yaml.dump(obj_from_stream, Dumper=AnsibleDumper)
+            yaml_string_obj_from_string = yaml.dump(obj_from_string, Dumper=AnsibleDumper)
+        else:
+            yaml_string_obj_from_stream = yaml.dump(obj_from_stream, Dumper=AnsibleDumper, encoding=None)
+            yaml_string_obj_from_string = yaml.dump(obj_from_string, Dumper=AnsibleDumper, encoding=None)
+
+        assert yaml_string == yaml_string_obj_from_stream
+        assert yaml_string == yaml_string_obj_from_stream == yaml_string_obj_from_string
+        assert (yaml_string == yaml_string_obj_from_stream == yaml_string_obj_from_string == yaml_string_stream_obj_from_stream ==
+                yaml_string_stream_obj_from_string)
+        assert obj == obj_from_stream
+        assert obj == obj_from_string
+        assert obj == yaml_string_obj_from_stream
+        assert obj == yaml_string_obj_from_string
+        assert obj == obj_from_stream == obj_from_string == yaml_string_obj_from_stream == yaml_string_obj_from_string
+        return {'obj': obj,
+                'yaml_string': yaml_string,
+                'yaml_string_from_stream': yaml_string_from_stream,
+                'obj_from_stream': obj_from_stream,
+                'obj_from_string': obj_from_string,
+                'yaml_string_obj_from_string': yaml_string_obj_from_string}
--- a/tests/unit/modules/conftest.py
+++ b/tests/unit/modules/conftest.py
@@ -0,0 +1,32 @@
+# Copyright (c) 2017 Ansible Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+import json
+
+import pytest
+
+from ansible.module_utils.six import string_types
+from ansible.module_utils._text import to_bytes
+from ansible.module_utils.common._collections_compat import MutableMapping
+
+
+@pytest.fixture
+def patch_ansible_module(request, mocker):
+    if isinstance(request.param, string_types):
+        args = request.param
+    elif isinstance(request.param, MutableMapping):
+        if 'ANSIBLE_MODULE_ARGS' not in request.param:
+            request.param = {'ANSIBLE_MODULE_ARGS': request.param}
+        if '_ansible_remote_tmp' not in request.param['ANSIBLE_MODULE_ARGS']:
+            request.param['ANSIBLE_MODULE_ARGS']['_ansible_remote_tmp'] = '/tmp'
+        if '_ansible_keep_remote_files' not in request.param['ANSIBLE_MODULE_ARGS']:
+            request.param['ANSIBLE_MODULE_ARGS']['_ansible_keep_remote_files'] = False
+        args = json.dumps(request.param)
+    else:
+        raise Exception('Malformed data to the patch_ansible_module pytest fixture')
+
+    mocker.patch('ansible.module_utils.basic._ANSIBLE_ARGS', to_bytes(args))
--- a/tests/unit/modules/system/test_mount.py
+++ b/tests/unit/modules/system/test_mount.py
@@ -7,7 +7,7 @@ import tempfile

 from ansible_collections.ansible.posix.tests.unit.compat import unittest
 from ansible_collections.ansible.posix.tests.unit.compat.mock import MagicMock
-from ansible.module_utils.common.text.converters import to_bytes
+from ansible.module_utils._text import to_bytes

 from ansible_collections.ansible.posix.plugins.modules.mount import (
    get_linux_mounts,
--- a/tests/unit/modules/utils.py
+++ b/tests/unit/modules/utils.py
@@ -0,0 +1,51 @@
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+import json
+
+from ansible_collections.ansible.posix.tests.unit.compat import unittest
+from ansible_collections.ansible.posix.tests.unit.compat.mock import patch
+from ansible.module_utils import basic
+from ansible.module_utils._text import to_bytes
+
+
+def set_module_args(args):
+    if '_ansible_remote_tmp' not in args:
+        args['_ansible_remote_tmp'] = '/tmp'
+    if '_ansible_keep_remote_files' not in args:
+        args['_ansible_keep_remote_files'] = False
+
+    args = json.dumps({'ANSIBLE_MODULE_ARGS': args})
+    basic._ANSIBLE_ARGS = to_bytes(args)
+
+
+class AnsibleExitJson(Exception):
+    pass
+
+
+class AnsibleFailJson(Exception):
+    pass
+
+
+def exit_json(*args, **kwargs):
+    if 'changed' not in kwargs:
+        kwargs['changed'] = False
+    raise AnsibleExitJson(kwargs)
+
+
+def fail_json(*args, **kwargs):
+    kwargs['failed'] = True
+    raise AnsibleFailJson(kwargs)
+
+
+class ModuleTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.mock_module = patch.multiple(basic.AnsibleModule, exit_json=exit_json, fail_json=fail_json)
+        self.mock_module.start()
+        self.mock_sleep = patch('time.sleep')
+        self.mock_sleep.start()
+        set_module_args({})
+        self.addCleanup(self.mock_module.stop)
+        self.addCleanup(self.mock_sleep.stop)
--- a/tests/utils/shippable/lint.sh
+++ b/tests/utils/shippable/lint.sh
@@ -9,5 +9,6 @@ command -v ansible
 pip install --upgrade --user pip
 pip install --upgrade --user ansible-lint

-# To specify additional options, you can specify them into .ansible-lint file.
-PATH="${PATH/\~/${HOME}}" ansible-lint
+PATH="${PATH/\~/${HOME}}" ansible-lint \
+                                    --exclude changelogs/ \
+                                    --profile=production
--- a/tests/utils/shippable/timing.py
+++ b/tests/utils/shippable/timing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
Author	SHA1	Message	Date
Klaas Demter	cb958b6a17	Merge `889ca91b48` into `dabaca4b70`	2025-05-20 10:36:54 +00:00
Klaas Demter	889ca91b48	Fixes #462 notice permission denied on authorized_key module	2025-05-20 12:36:42 +02:00