mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-11-22 15:10:30 +00:00
Compare commits
48
Commits
5dd6507835
..
2.2.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d9af430396 | ||
|
|
9cf6a06ca7 | ||
|
|
1009d5cb28 | ||
|
|
42feec22c7 | ||
|
|
ec51a15f69 | ||
|
|
0b197ad440 | ||
|
|
165babdd69 | ||
|
|
8b5bba6fa1 | ||
|
|
714c50bdb7 | ||
|
|
c163fb089e | ||
|
|
e29860f4d2 | ||
|
|
668015a48c | ||
|
|
947dacff6a | ||
|
|
76af9b713e | ||
|
|
8f9c844b3d | ||
|
|
d901769726 | ||
|
|
cdce0f5218 | ||
|
|
8feac41f50 | ||
|
|
04274f4ce7 | ||
|
|
1bcf7f3ee4 | ||
|
|
30db9884ce | ||
|
|
d16e94f541 | ||
|
|
535167e254 | ||
|
|
6336671eba | ||
|
|
f7ed590388 | ||
|
|
07c6e38679 | ||
|
|
f6663b7511 | ||
|
|
8831aa205c | ||
|
|
e54b8bf68f | ||
|
|
d792d39716 | ||
|
|
9d3cb96f23 | ||
|
|
a27063e1dc | ||
|
|
2351c27339 | ||
|
|
5902dcab58 | ||
|
|
953577cdb7 | ||
|
|
59493f92aa | ||
|
|
20ea2f068e | ||
|
|
1f1d637b7f | ||
|
|
7128f64169 | ||
|
|
3149f38296 | ||
|
|
8cc459f381 | ||
|
|
82e4990f72 | ||
|
|
98f3e1255e | ||
|
|
a004bd9494 | ||
|
|
a357ceeb49 | ||
|
|
e8fc89fe5a | ||
|
|
ce72b7b1f4 | ||
|
|
f61bb76a86 |
@@ -4,6 +4,7 @@
|
||||
# SPDX-FileCopyrightText: 2024, Ansible Project
|
||||
|
||||
skip_list:
|
||||
- meta-runtime[unsupported-version] # This 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
|
||||
|
||||
|
||||
@@ -37,9 +37,8 @@ variables:
|
||||
resources:
|
||||
containers:
|
||||
- container: default
|
||||
image: quay.io/ansible/azure-pipelines-test-container:8.0.0
|
||||
- container: legacy
|
||||
image: quay.io/ansible/azure-pipelines-test-container:7.0.0
|
||||
|
||||
pool: Standard
|
||||
|
||||
stages:
|
||||
@@ -129,7 +128,6 @@ stages:
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
container: legacy
|
||||
nameFormat: "{0}"
|
||||
testFormat: 2.17/{0}
|
||||
targets:
|
||||
@@ -147,7 +145,6 @@ stages:
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
container: legacy
|
||||
nameFormat: "{0}"
|
||||
testFormat: 2.16/{0}
|
||||
targets:
|
||||
@@ -240,7 +237,6 @@ stages:
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
container: legacy
|
||||
testFormat: 2.17/linux/{0}/1
|
||||
targets:
|
||||
- name: Fedora 39
|
||||
@@ -254,7 +250,6 @@ stages:
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
container: legacy
|
||||
testFormat: 2.16/linux/{0}/1
|
||||
targets:
|
||||
- name: Fedora 38
|
||||
@@ -271,14 +266,14 @@ stages:
|
||||
parameters:
|
||||
testFormat: devel/{0}/1
|
||||
targets:
|
||||
- name: RHEL 10.2
|
||||
test: rhel/10.2
|
||||
- name: RHEL 9.8
|
||||
test: rhel/9.8
|
||||
- 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.1
|
||||
test: freebsd/15.1
|
||||
- name: FreeBSD 15.0
|
||||
test: freebsd/15.0
|
||||
|
||||
- stage: Remote_2_21
|
||||
displayName: Remote 2.21
|
||||
@@ -326,8 +321,8 @@ stages:
|
||||
test: rhel/10.1
|
||||
- name: RHEL 9.7
|
||||
test: rhel/9.7
|
||||
- name: FreeBSD 14.3
|
||||
test: freebsd/14.3
|
||||
- name: FreeBSD 14.2
|
||||
test: freebsd/14.2
|
||||
- name: FreeBSD 13.5
|
||||
test: freebsd/13.5
|
||||
|
||||
@@ -352,7 +347,6 @@ stages:
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
container: legacy
|
||||
testFormat: 2.17/{0}/1
|
||||
targets:
|
||||
- name: RHEL 10.0
|
||||
@@ -366,7 +360,6 @@ stages:
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
container: legacy
|
||||
testFormat: 2.16/{0}/1
|
||||
targets:
|
||||
- name: RHEL 10.1
|
||||
|
||||
@@ -14,12 +14,6 @@ parameters:
|
||||
type: object
|
||||
default: []
|
||||
|
||||
# An optional container resource name to use for the test jobs.
|
||||
# Defaults to "default" if not specified.
|
||||
- name: container
|
||||
type: string
|
||||
default: default
|
||||
|
||||
# An optional format string used to generate the job name.
|
||||
# - {0} is the name of an item in the targets list.
|
||||
- name: nameFormat
|
||||
@@ -49,7 +43,6 @@ parameters:
|
||||
jobs:
|
||||
- template: test.yml
|
||||
parameters:
|
||||
container: ${{ parameters.container }}
|
||||
jobs:
|
||||
- ${{ if eq(length(parameters.groups), 0) }}:
|
||||
- ${{ each target in parameters.targets }}:
|
||||
|
||||
@@ -7,17 +7,11 @@ parameters:
|
||||
- name: jobs
|
||||
type: object
|
||||
|
||||
# An optional container resource name to use for the test jobs.
|
||||
# Defaults to "default" if not specified.
|
||||
- name: container
|
||||
type: string
|
||||
default: default
|
||||
|
||||
jobs:
|
||||
- ${{ each job in parameters.jobs }}:
|
||||
- job: test_${{ replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_') }}
|
||||
displayName: ${{ job.name }}
|
||||
container: ${{ parameters.container }}
|
||||
container: default
|
||||
workspace:
|
||||
clean: all
|
||||
steps:
|
||||
|
||||
@@ -4,6 +4,71 @@ ansible.posix Release Notes
|
||||
|
||||
.. contents:: Topics
|
||||
|
||||
v2.2.0
|
||||
======
|
||||
|
||||
Release Summary
|
||||
---------------
|
||||
|
||||
This is the minor release of the ``ansible.posix`` collection.
|
||||
This changelog contains all changes to the modules and plugins
|
||||
in the stable-2 branch that have been added after the release of
|
||||
``ansible.posix`` 2.1.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).
|
||||
- firewalld_info - use module.warn instead of passing ``warnings`` to ``exit_json`` (https://github.com/ansible-collections/ansible.posix/issues/710).
|
||||
- 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 - Add option to provide a different date/time format (https://github.com/ansible-collections/ansible.posix/issues/279).
|
||||
- profile_tasks callback - fix deprecated ``ansible.module_utils.six`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
|
||||
- removed ANSIBLE_METADATA from remaining plugins.
|
||||
- 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).
|
||||
|
||||
Bugfixes
|
||||
--------
|
||||
|
||||
- acl - correctly assert needed changes when pointing to a directory and recursive is set to true.
|
||||
- ansible.posix.authorized_key - fixes error on permission denied in authorized_key module (https://github.com/ansible-collections/ansible.posix/issues/462).
|
||||
- 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).
|
||||
- patch - removed use of deprecated ``_AnsibleActionDone`` API (https://github.com/ansible-collections/ansible.posix/pull/687).
|
||||
|
||||
v2.1.0
|
||||
======
|
||||
|
||||
Release Summary
|
||||
---------------
|
||||
|
||||
This is the minor release of the ``ansible.posix`` collection.
|
||||
This changelog contains all changes to the modules and plugins
|
||||
in the stable-2 branch that have been added after the release of
|
||||
``ansible.posix`` 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).
|
||||
|
||||
Bugfixes
|
||||
--------
|
||||
|
||||
- ansible.posix.cgroup_perf_recap - fixes json module load path (https://github.com/ansible-collections/ansible.posix/issues/630).
|
||||
|
||||
v2.0.0
|
||||
======
|
||||
|
||||
|
||||
@@ -99,8 +99,7 @@ We welcome community contributions to this collection. For more details, see [Co
|
||||
|
||||
## Support
|
||||
|
||||
* Community users can find help through the [Communication](#Communication) section.
|
||||
* Red Hat Ansible Automation Platform subscribers can request support through [Automation Hub](https://console.redhat.com/ansible/automation-hub/collections/published/ansible/posix/) by using the "Create issue" button on the collection page.
|
||||
See [Communication](#Communication) section.
|
||||
|
||||
## Release Notes and Roadmap
|
||||
|
||||
|
||||
@@ -490,3 +490,91 @@ releases:
|
||||
- 597_remove_fstab_comment_on_updating.yml
|
||||
- 598_icmp_block_inversion.yml
|
||||
release_date: '2024-12-04'
|
||||
2.1.0:
|
||||
changes:
|
||||
bugfixes:
|
||||
- ansible.posix.cgroup_perf_recap - fixes json module load path (https://github.com/ansible-collections/ansible.posix/issues/630).
|
||||
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).
|
||||
release_summary: 'This is the minor release of the ``ansible.posix`` collection.
|
||||
|
||||
This changelog contains all changes to the modules and plugins
|
||||
|
||||
in the stable-2 branch that have been added after the release of
|
||||
|
||||
``ansible.posix`` 2.0.0'
|
||||
fragments:
|
||||
- 2.1.0.yml
|
||||
- 631_fixes_module_path.yml
|
||||
- 642_ci_add_rhel10.yml
|
||||
- 650-profile_tasks_roles.yml
|
||||
- 654_ci_bump_core_version.yml
|
||||
release_date: '2025-07-16'
|
||||
2.2.0:
|
||||
changes:
|
||||
bugfixes:
|
||||
- acl - correctly assert needed changes when pointing to a directory and recursive
|
||||
is set to true.
|
||||
- ansible.posix.authorized_key - fixes error on permission denied in authorized_key
|
||||
module (https://github.com/ansible-collections/ansible.posix/issues/462).
|
||||
- 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).
|
||||
- patch - removed use of deprecated ``_AnsibleActionDone`` API (https://github.com/ansible-collections/ansible.posix/pull/687).
|
||||
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).
|
||||
- firewalld_info - use module.warn instead of passing ``warnings`` to ``exit_json``
|
||||
(https://github.com/ansible-collections/ansible.posix/issues/710).
|
||||
- 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 - Add option to provide a different date/time format (https://github.com/ansible-collections/ansible.posix/issues/279).
|
||||
- profile_tasks callback - fix deprecated ``ansible.module_utils.six`` import
|
||||
(https://github.com/ansible-collections/ansible.posix/issues/686).
|
||||
- removed ANSIBLE_METADATA from remaining plugins.
|
||||
- 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).
|
||||
release_summary: 'This is the minor release of the ``ansible.posix`` collection.
|
||||
|
||||
This changelog contains all changes to the modules and plugins
|
||||
|
||||
in the stable-2 branch that have been added after the release of
|
||||
|
||||
``ansible.posix`` 2.1.0'
|
||||
fragments:
|
||||
- 2.2.0.yml
|
||||
- 626_profile_tasks_datetime_format.yml
|
||||
- 638_fix_recursive_acl.yml
|
||||
- 639_fix_authorized_key.yml
|
||||
- 660_ci_azp_syntax.yml
|
||||
- 665_update_readme_20250728.yml
|
||||
- 666_azp_update_20250728.yml
|
||||
- 670-deprecations.yml
|
||||
- 673_update_ci_20250805.yml
|
||||
- 682_update_ci_20250929.yml
|
||||
- 686_fix_deprecated_imports.yml
|
||||
- 693_azp_update_20251205.yml
|
||||
- ansible_metadata_removed.yml
|
||||
- firewalld_info_warnings.yml
|
||||
- patch_removed.yml
|
||||
release_date: '2026-05-18'
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
trivial:
|
||||
- Bump version to 3.0.0 for the next release (https://github.com/ansible-collections/ansible.posix/issues/603).
|
||||
@@ -1,2 +0,0 @@
|
||||
trivial:
|
||||
- Remove ubuntu20.04 from CI tests (https://github.com/ansible-collections/ansible.posix/issues/612).
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
minor_changes:
|
||||
- profile_tasks - Add option to provide a different date/time format (https://github.com/ansible-collections/ansible.posix/issues/279).
|
||||
@@ -1,6 +0,0 @@
|
||||
---
|
||||
bugfixes:
|
||||
- ansible.posix.cgroup_perf_recap - fixes json module load path (https://github.com/ansible-collections/ansible.posix/issues/630).
|
||||
trivial:
|
||||
- ansible.posix.seboolean - remove unnecessary condition from seboolean integration tests (https://github.com/ansible-collections/ansible.posix/issues/630).
|
||||
- ansible.posix.selinux - optimize conditions for selinux integration tests (https://github.com/ansible-collections/ansible.posix/issues/630).
|
||||
@@ -1,2 +0,0 @@
|
||||
bugfixes:
|
||||
- acl - correctly assert needed changes when pointing to a directory and recursive is set to true.
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
bugfixes:
|
||||
- ansible.posix.authorized_key - fixes error on permission denied in authorized_key module (https://github.com/ansible-collections/ansible.posix/issues/462).
|
||||
@@ -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).
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
trivial:
|
||||
- sysctl - added the attributes section to the module documentation to reflect check_mode support (https://github.com/ansible-collections/ansible.posix/issues/643).
|
||||
@@ -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)."
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
trivial:
|
||||
- Bump ansible-core version to 2.20 of devel branch and add 2.19 to CI
|
||||
@@ -1,2 +0,0 @@
|
||||
trivial:
|
||||
- AZP - fixed syntax error in CI test.
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
trivial:
|
||||
- README - Update README to reflect Ansible Core 2.19 release.
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
trivial:
|
||||
- AZP - Update AZP matrix to follow ansible-test changes.
|
||||
@@ -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)."
|
||||
@@ -1,2 +0,0 @@
|
||||
trivial:
|
||||
- Update AZP CI matrix (https://github.com/ansible-collections/ansible.posix/issues/673).
|
||||
@@ -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.
|
||||
@@ -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).
|
||||
@@ -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.
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
trivial:
|
||||
- Update Azure Pipelines test container to 8.0.0 and use legacy container for ansible-core 2.16/2.17.
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
trivial:
|
||||
- Replace AZP remote test FreeBSD-14.2 with 14.3 for Ansible Core 2.19.
|
||||
@@ -1,2 +0,0 @@
|
||||
security_fixes:
|
||||
- authorized_key - fix local privilege escalation via symlink-following when running as root (https://github.com/ansible-collections/ansible.posix/issues/759).
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
trivial:
|
||||
- Replace AZP remote test RHEL9.7 and RHEL10.1 with 9.8 and 10.2 for devel branch.
|
||||
@@ -1,4 +0,0 @@
|
||||
---
|
||||
trivial:
|
||||
- ansible-lint - Removed ``meta-runtime[unsupported-version]`` from the skip_list in ``.ansible-lint``.
|
||||
...
|
||||
@@ -1,4 +0,0 @@
|
||||
---
|
||||
bugfixes:
|
||||
- README - Added ``Red Hat Automation Hub`` as correct contact information for Red Hat Ansible Automation Platform subscribers.
|
||||
...
|
||||
@@ -1,5 +0,0 @@
|
||||
---
|
||||
bugfixes:
|
||||
- profile_tasks callback - align TASKS RECAP output with ``display.banner()`` width instead of a hardcoded 79 columns (https://github.com/ansible-collections/ansible.posix/pull/773).
|
||||
minor_changes:
|
||||
- profile_tasks callback - add ``truncate_task_names`` option (default ``false``) to ellipsize long task names in the TASKS RECAP summary (https://github.com/ansible-collections/ansible.posix/pull/773).
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
trivial:
|
||||
- AZP - Update AZP matrix to follow ansible-test changes.
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
minor_changes:
|
||||
- removed ANSIBLE_METADATA from remaining plugins.
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
minor_changes:
|
||||
- firewalld_info - use module.warn instead of passing ``warnings`` to ``exit_json`` (https://github.com/ansible-collections/ansible.posix/issues/710).
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
bugfixes:
|
||||
- sysctl - reload sysctl only if the sysctl file is ``/etc/sysctl.conf`` or ``/etc/sysctl.conf.local`` (https://github.com/ansible-collections/ansible.posix/issues/663).
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
bugfixes:
|
||||
- patch - removed use of deprecated ``_AnsibleActionDone`` API (https://github.com/ansible-collections/ansible.posix/pull/687).
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
---
|
||||
namespace: ansible
|
||||
name: posix
|
||||
version: 3.0.0
|
||||
version: 2.2.0
|
||||
readme: README.md
|
||||
authors:
|
||||
- Ansible (github.com/ansible)
|
||||
|
||||
@@ -63,17 +63,6 @@ DOCUMENTATION = '''
|
||||
- section: callback_profile_tasks
|
||||
key: datetime_format
|
||||
version_added: 3.0.0
|
||||
truncate_task_names:
|
||||
description:
|
||||
- Truncate long task names in the TASKS RECAP summary with an ellipsis so rows stay within the terminal width.
|
||||
type: bool
|
||||
default: false
|
||||
env:
|
||||
- name: PROFILE_TASKS_TRUNCATE_TASK_NAMES
|
||||
ini:
|
||||
- section: callback_profile_tasks
|
||||
key: truncate_task_names
|
||||
version_added: 2.3.0
|
||||
'''
|
||||
|
||||
EXAMPLES = '''
|
||||
@@ -99,7 +88,6 @@ from datetime import datetime
|
||||
|
||||
from functools import reduce
|
||||
from ansible.plugins.callback import CallbackBase
|
||||
from ansible.utils.display import get_text_width
|
||||
|
||||
|
||||
# define start time
|
||||
@@ -114,64 +102,16 @@ def secondsToStr(t):
|
||||
return "%d:%02d:%02d.%03d" % tuple(reduce(rediv, [[t * 1000, ], 1000, 60, 60]))
|
||||
|
||||
|
||||
def filled(msg, columns, fchar="*"):
|
||||
"""Fill to the same width as display.banner() (columns + 1)."""
|
||||
if not msg:
|
||||
return fchar * (columns + 1)
|
||||
try:
|
||||
msg_width = get_text_width(msg)
|
||||
except EnvironmentError:
|
||||
msg_width = len(msg)
|
||||
fill_len = columns - msg_width
|
||||
if fill_len < 3:
|
||||
fill_len = 3
|
||||
return "%s %s" % (msg, fchar * fill_len)
|
||||
|
||||
|
||||
def _text_width(text):
|
||||
try:
|
||||
return get_text_width(text)
|
||||
except EnvironmentError:
|
||||
return len(text)
|
||||
|
||||
|
||||
def truncate_name(name, width):
|
||||
if width <= 0:
|
||||
return name
|
||||
if _text_width(name) <= width:
|
||||
return name
|
||||
if width <= 3:
|
||||
return name[:width]
|
||||
ellipsis = '...'
|
||||
for end in range(len(name), 0, -1):
|
||||
candidate = name[:end] + ellipsis
|
||||
if _text_width(candidate) <= width:
|
||||
return candidate
|
||||
return ellipsis
|
||||
|
||||
|
||||
def pad_to_display_width(text, width, fillchar='-'):
|
||||
current = _text_width(text)
|
||||
if current >= width:
|
||||
return text
|
||||
return text + fillchar * (width - current)
|
||||
|
||||
|
||||
def format_timing_row(task_name, elapsed, columns, truncate=False):
|
||||
line_width = columns + 1
|
||||
time_field_width = 9
|
||||
name_field_width = line_width - time_field_width
|
||||
if truncate:
|
||||
task_name = truncate_name(task_name, name_field_width - 1)
|
||||
prefix = task_name + u' '
|
||||
gap = name_field_width - _text_width(prefix)
|
||||
if gap == 1:
|
||||
# A lone dash before the timing field looks like misaligned padding.
|
||||
left = prefix + u' '
|
||||
def filled(msg, fchar="*"):
|
||||
if len(msg) == 0:
|
||||
width = 79
|
||||
else:
|
||||
left = pad_to_display_width(prefix, name_field_width)
|
||||
timing = u' {0:.02f}s'.format(elapsed)
|
||||
return left + timing.rjust(time_field_width, u'-')
|
||||
msg = "%s " % msg
|
||||
width = 79 - len(msg)
|
||||
if width < 3:
|
||||
width = 3
|
||||
filler = fchar * width
|
||||
return "%s%s " % (msg, filler)
|
||||
|
||||
|
||||
def timestamp(self):
|
||||
@@ -187,10 +127,7 @@ def tasktime(self):
|
||||
time_elapsed = secondsToStr((cdtn - dtn).total_seconds())
|
||||
time_total_elapsed = secondsToStr((cdtn - dt0).total_seconds())
|
||||
dtn = cdtn
|
||||
return filled(
|
||||
'%s (%s)%s%s' % (datetime_current, time_elapsed, ' ' * 7, time_total_elapsed),
|
||||
self._display.columns,
|
||||
)
|
||||
return filled('%s (%s)%s%s' % (datetime_current, time_elapsed, ' ' * 7, time_total_elapsed))
|
||||
|
||||
|
||||
class CallbackModule(CallbackBase):
|
||||
@@ -211,7 +148,6 @@ class CallbackModule(CallbackBase):
|
||||
self.summary_only = None
|
||||
self.task_output_limit = None
|
||||
self.datetime_format = None
|
||||
self.truncate_task_names = None
|
||||
|
||||
super(CallbackModule, self).__init__()
|
||||
|
||||
@@ -242,8 +178,6 @@ class CallbackModule(CallbackBase):
|
||||
if self.datetime_format == 'iso8601':
|
||||
self.datetime_format = '%Y-%m-%dT%H:%M:%S.%f'
|
||||
|
||||
self.truncate_task_names = self.get_option('truncate_task_names')
|
||||
|
||||
def _display_tasktime(self):
|
||||
if not self.summary_only:
|
||||
self._display.display(tasktime(self))
|
||||
@@ -276,12 +210,11 @@ class CallbackModule(CallbackBase):
|
||||
self._record_task(task)
|
||||
|
||||
def v2_playbook_on_stats(self, stats):
|
||||
columns = self._display.columns
|
||||
line_width = columns + 1
|
||||
self._display.display(filled("TASKS RECAP", columns))
|
||||
# Align summary report header with other callback plugin summary
|
||||
self._display.banner("TASKS RECAP")
|
||||
|
||||
self._display.display(tasktime(self))
|
||||
self._display.display(filled("", columns, fchar="="))
|
||||
self._display.display(filled("", fchar="="))
|
||||
|
||||
timestamp(self)
|
||||
self.current = None
|
||||
@@ -301,15 +234,7 @@ class CallbackModule(CallbackBase):
|
||||
|
||||
# Print the timings
|
||||
for uuid, result in results:
|
||||
msg = format_timing_row(
|
||||
result['name'],
|
||||
result['elapsed'],
|
||||
columns,
|
||||
truncate=self.truncate_task_names,
|
||||
)
|
||||
msg = u"{0:-<{2}}{1:->9}".format(result['name'] + u' ', u' {0:.02f}s'.format(result['elapsed']), self._display.columns - 9)
|
||||
if 'path' in result:
|
||||
path_name = result['path']
|
||||
if self.truncate_task_names:
|
||||
path_name = truncate_name(path_name, line_width - 1)
|
||||
msg += u"\n%s" % pad_to_display_width(path_name + u' ', line_width)
|
||||
msg += u"\n{0:-<{1}}".format(result['path'] + u' ', self._display.columns)
|
||||
self._display.display(msg)
|
||||
|
||||
@@ -121,10 +121,10 @@ EXAMPLES = r'''
|
||||
ansible.posix.authorized_key:
|
||||
user: deploy
|
||||
state: present
|
||||
key: "{{ lookup('file', item) }}"
|
||||
loop:
|
||||
- public_keys/doe-jane
|
||||
- public_keys/doe-john
|
||||
key: '{{ item }}'
|
||||
with_file:
|
||||
- public_keys/doe-jane
|
||||
- public_keys/doe-john
|
||||
|
||||
- name: Set authorized key defining key options
|
||||
ansible.posix.authorized_key:
|
||||
@@ -307,17 +307,6 @@ class keydict(dict):
|
||||
return [item[1] for item in self.items()]
|
||||
|
||||
|
||||
def _safe_open_write(module, path, follow):
|
||||
flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
|
||||
if not follow and hasattr(os, 'O_NOFOLLOW'):
|
||||
flags |= os.O_NOFOLLOW
|
||||
try:
|
||||
fd = os.open(path, flags, int('0600', 8))
|
||||
except OSError as e:
|
||||
module.fail_json(msg="File open failed %s : %s" % (path, to_native(e)))
|
||||
return fd
|
||||
|
||||
|
||||
def keyfile(module, user, write=False, path=None, manage_dir=True, follow=False):
|
||||
"""
|
||||
Calculate name of authorized keys file, optionally creating the
|
||||
@@ -370,7 +359,7 @@ def keyfile(module, user, write=False, path=None, manage_dir=True, follow=False)
|
||||
module.fail_json(msg="Failed to create directory %s : %s" % (sshdir, to_native(e)))
|
||||
if module.selinux_enabled():
|
||||
module.set_default_selinux_context(sshdir, False)
|
||||
os.chown(sshdir, uid, gid, follow_symlinks=follow)
|
||||
os.chown(sshdir, uid, gid)
|
||||
os.chmod(sshdir, int('0700', 8))
|
||||
|
||||
if not os.path.exists(keysfile):
|
||||
@@ -378,13 +367,16 @@ def keyfile(module, user, write=False, path=None, manage_dir=True, follow=False)
|
||||
if not os.path.exists(basedir):
|
||||
os.makedirs(basedir)
|
||||
|
||||
fd = _safe_open_write(module, keysfile, follow)
|
||||
os.close(fd)
|
||||
f = None
|
||||
try:
|
||||
f = open(keysfile, "w") # touches file so we can set ownership and perms
|
||||
finally:
|
||||
f.close()
|
||||
if module.selinux_enabled():
|
||||
module.set_default_selinux_context(keysfile, False)
|
||||
|
||||
try:
|
||||
os.chown(keysfile, uid, gid, follow_symlinks=follow)
|
||||
os.chown(keysfile, uid, gid)
|
||||
os.chmod(keysfile, int('0600', 8))
|
||||
except OSError:
|
||||
pass
|
||||
@@ -615,7 +607,7 @@ def enforce_state(module, params):
|
||||
|
||||
# check current state -- just get the filename, don't create file
|
||||
do_write = False
|
||||
params["keyfile"] = keyfile(module, user, do_write, path, manage_dir, follow)
|
||||
params["keyfile"] = keyfile(module, user, do_write, path, manage_dir)
|
||||
existing_content = readfile(module, params["keyfile"])
|
||||
existing_keys = parsekeys(module, existing_content)
|
||||
|
||||
@@ -704,11 +696,6 @@ def enforce_state(module, params):
|
||||
|
||||
if not module.check_mode:
|
||||
writefile(module, filename, new_content)
|
||||
user_entry = pwd.getpwnam(user)
|
||||
uid = user_entry.pw_uid
|
||||
gid = user_entry.pw_gid
|
||||
os.chown(filename, uid, gid, follow_symlinks=follow)
|
||||
os.chmod(filename, int('0600', 8))
|
||||
params['changed'] = True
|
||||
|
||||
return params
|
||||
|
||||
@@ -12,12 +12,9 @@ __metaclass__ = type
|
||||
DOCUMENTATION = r'''
|
||||
---
|
||||
module: sysctl
|
||||
short_description: Manage sysctl entries
|
||||
short_description: Manage entries in sysctl.conf.
|
||||
description:
|
||||
- This module manipulates sysctl entries and optionally performs a C(/sbin/sysctl -p) after changing them.
|
||||
- If you are using C(systemd-sysctl(8)), note that it won't use the file C(/etc/sysctl.conf).
|
||||
- If you are using C(procps) sysctl, it reads C(/etc/sysctl.conf).
|
||||
- Read more about L(sysctl.conf, https://www.man7.org/linux/man-pages/man5/sysctl.conf.5.html).
|
||||
version_added: "1.0.0"
|
||||
options:
|
||||
name:
|
||||
@@ -44,14 +41,14 @@ options:
|
||||
default: false
|
||||
reload:
|
||||
description:
|
||||
- If V(true), performs a C(/sbin/sysctl -p) if the O(sysctl_file) is updated.
|
||||
- If V(false), does not reload C(sysctl) even if the O(sysctl_file) is updated.
|
||||
- For FreeBSD, can not be used with O(sysctl_file) other than C(/etc/sysctl.conf) or C(/etc/sysctl.conf.local).
|
||||
- If V(true), performs a C(/sbin/sysctl -p) if the O(sysctl_file) is
|
||||
updated. If V(false), does not reload C(sysctl) even if the
|
||||
O(sysctl_file) is updated.
|
||||
type: bool
|
||||
default: true
|
||||
sysctl_file:
|
||||
description:
|
||||
- Specifies the absolute path to sysctl file, if not C(/etc/sysctl.conf).
|
||||
- Specifies the absolute path to C(sysctl.conf), if not C(/etc/sysctl.conf).
|
||||
default: /etc/sysctl.conf
|
||||
type: path
|
||||
sysctl_set:
|
||||
@@ -59,17 +56,6 @@ options:
|
||||
- Verify token value with the sysctl command and set with C(-w) if necessary.
|
||||
type: bool
|
||||
default: false
|
||||
attributes:
|
||||
check_mode:
|
||||
support: full
|
||||
description: Can run in check_mode and return changed status prediction without modifying target.
|
||||
diff_mode:
|
||||
support: none
|
||||
description: Does not support differences output.
|
||||
platform:
|
||||
platforms: posix
|
||||
support: full
|
||||
description: Supported on POSIX-compliant systems.
|
||||
author:
|
||||
- David CHANIAL (@davixx)
|
||||
'''
|
||||
@@ -169,11 +155,6 @@ class SysctlModule(object):
|
||||
|
||||
self.platform = platform.system().lower()
|
||||
|
||||
# system specific tests
|
||||
freebsd_sysctl_files = ['/etc/sysctl.conf', '/etc/sysctl.conf.local']
|
||||
if self.platform == 'freebsd' and self.sysctl_file not in freebsd_sysctl_files and self.args['reload']:
|
||||
self.module.fail_json(msg="%s can not be reloaded. Set reload=False." % self.sysctl_file)
|
||||
|
||||
# Whitespace is bad
|
||||
self.args['name'] = self.args['name'].strip()
|
||||
self.args['value'] = self._parse_value(self.args['value'])
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
---
|
||||
#
|
||||
# Check: keysfile is symlink and follow=false
|
||||
#
|
||||
- name: Try to add key with keysfile as symlink
|
||||
ansible.posix.authorized_key:
|
||||
user: testuser
|
||||
key: "{{ rsa_key_basic }}"
|
||||
state: present
|
||||
manage_dir: false
|
||||
follow: false
|
||||
|
||||
- name: Assert target file ownership unchanged
|
||||
ansible.builtin.stat:
|
||||
path: /tmp/symlink_test_target/target_file
|
||||
register: target_file_stat
|
||||
|
||||
- name: Verify target file is still owned by root
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- target_file_stat.stat.uid == 0
|
||||
...
|
||||
@@ -1,12 +0,0 @@
|
||||
---
|
||||
- name: Remove testuser
|
||||
ansible.builtin.user:
|
||||
name: testuser
|
||||
state: absent
|
||||
remove: true
|
||||
|
||||
- name: Remove symlink target directory
|
||||
ansible.builtin.file:
|
||||
path: /tmp/symlink_test_target
|
||||
state: absent
|
||||
...
|
||||
@@ -1,38 +0,0 @@
|
||||
---
|
||||
- name: Create testuser for symlink tests
|
||||
ansible.builtin.user:
|
||||
name: testuser
|
||||
create_home: true
|
||||
register: testuser_result
|
||||
|
||||
- name: Create symlink target directory
|
||||
ansible.builtin.file:
|
||||
path: /tmp/symlink_test_target
|
||||
state: directory
|
||||
owner: root
|
||||
mode: '0700'
|
||||
|
||||
- name: Create a target file owned by root
|
||||
ansible.builtin.copy:
|
||||
dest: /tmp/symlink_test_target/target_file
|
||||
content: "sensitive data"
|
||||
owner: root
|
||||
mode: '0600'
|
||||
|
||||
- name: Remove .ssh directory if exists
|
||||
ansible.builtin.file:
|
||||
path: "{{ testuser_result.home }}/.ssh"
|
||||
state: absent
|
||||
|
||||
- name: Create .ssh directory
|
||||
ansible.builtin.file:
|
||||
path: "{{ testuser_result.home }}/.ssh"
|
||||
state: directory
|
||||
mode: '0700'
|
||||
|
||||
- name: Create symlink from authorized_keys to target file
|
||||
ansible.builtin.file:
|
||||
src: /tmp/symlink_test_target/target_file
|
||||
dest: "{{ testuser_result.home }}/.ssh/authorized_keys"
|
||||
state: link
|
||||
...
|
||||
@@ -17,7 +17,7 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
- name: Setup for testing environment
|
||||
- name: Setup testing environment
|
||||
ansible.builtin.import_tasks: setup_steps.yml
|
||||
|
||||
- name: Test for multiple keys handling
|
||||
@@ -37,12 +37,3 @@
|
||||
|
||||
- name: Test for permission denied files
|
||||
ansible.builtin.import_tasks: check_permissions.yml
|
||||
|
||||
- name: CVE-2026-11837 Setup for symlink tests
|
||||
ansible.builtin.import_tasks: check_symlink_setup.yml
|
||||
|
||||
- name: CVE-2026-11837 Test for symlink tests
|
||||
ansible.builtin.import_tasks: check_symlink.yml
|
||||
|
||||
- name: CVE-2026-11837 Cleanup symlink test
|
||||
ansible.builtin.import_tasks: check_symlink_cleanup.yml
|
||||
|
||||
@@ -1,109 +0,0 @@
|
||||
from __future__ import absolute_import, division, print_function
|
||||
|
||||
__metaclass__ = type
|
||||
|
||||
from ansible_collections.ansible.posix.tests.unit.compat import unittest
|
||||
from ansible.utils.display import get_text_width
|
||||
|
||||
from ansible_collections.ansible.posix.plugins.callback.profile_tasks import (
|
||||
filled,
|
||||
format_timing_row,
|
||||
pad_to_display_width,
|
||||
truncate_name,
|
||||
)
|
||||
|
||||
|
||||
class ProfileTasksDisplayTestCase(unittest.TestCase):
|
||||
|
||||
COLUMNS = 79
|
||||
LINE_WIDTH = COLUMNS + 1
|
||||
# Reproducer from https://github.com/ansible-collections/ansible.posix/pull/773#issuecomment-5325694910
|
||||
MAINTAINER_ASCII_LONG = (
|
||||
'012345678901234567890123456789012345678901234567890'
|
||||
'12345678901234567890123456789'
|
||||
)
|
||||
MAINTAINER_CJK_LONG = (
|
||||
'零一二三四五六七八九零一二三四五六七八九'
|
||||
'零一二三四五六七八九零一二三四五六七八九'
|
||||
)
|
||||
ASCII_LONG = MAINTAINER_ASCII_LONG
|
||||
CJK_LONG = MAINTAINER_CJK_LONG
|
||||
|
||||
def test_filled_banner_matches_display_width(self):
|
||||
line = filled('TASKS RECAP', self.COLUMNS)
|
||||
self.assertEqual(get_text_width(line), self.LINE_WIDTH)
|
||||
self.assertTrue(line.endswith('*'))
|
||||
|
||||
def test_filled_separator_matches_display_width(self):
|
||||
line = filled('', self.COLUMNS, fchar='=')
|
||||
self.assertEqual(get_text_width(line), self.LINE_WIDTH)
|
||||
self.assertEqual(line, '=' * self.LINE_WIDTH)
|
||||
|
||||
def test_truncate_name_shortens_ascii_to_display_width(self):
|
||||
truncated = truncate_name(self.ASCII_LONG, 71)
|
||||
self.assertLessEqual(get_text_width(truncated), 71)
|
||||
self.assertTrue(truncated.endswith('...'))
|
||||
|
||||
def test_truncate_name_shortens_cjk_to_display_width(self):
|
||||
truncated = truncate_name(self.CJK_LONG, 71)
|
||||
self.assertLessEqual(get_text_width(truncated), 71)
|
||||
self.assertTrue(truncated.endswith('...'))
|
||||
|
||||
def test_truncate_name_leaves_short_names_unchanged(self):
|
||||
short = 'Short task'
|
||||
self.assertEqual(truncate_name(short, 71), short)
|
||||
self.assertEqual(truncate_name(self.CJK_LONG[:5], 71), self.CJK_LONG[:5])
|
||||
|
||||
def test_format_timing_row_ascii_fits_terminal_width(self):
|
||||
row = format_timing_row(self.ASCII_LONG, 0.01, self.COLUMNS, truncate=True)
|
||||
self.assertEqual(get_text_width(row), self.LINE_WIDTH)
|
||||
self.assertIn('0.01s', row)
|
||||
|
||||
def test_format_timing_row_cjk_fits_terminal_width(self):
|
||||
row = format_timing_row(self.CJK_LONG, 0.01, self.COLUMNS, truncate=True)
|
||||
self.assertEqual(get_text_width(row), self.LINE_WIDTH)
|
||||
self.assertIn('0.01s', row)
|
||||
|
||||
def test_maintainer_cjk_reproducer_fits_under_len_budget_but_not_display_width(self):
|
||||
self.assertEqual(len(self.MAINTAINER_CJK_LONG), 40)
|
||||
self.assertEqual(get_text_width(self.MAINTAINER_CJK_LONG), 80)
|
||||
self.assertGreater(len(self.MAINTAINER_CJK_LONG), 0)
|
||||
|
||||
def test_maintainer_cjk_reproducer_truncates_with_ellipsis(self):
|
||||
truncated = truncate_name(self.MAINTAINER_CJK_LONG, 71)
|
||||
self.assertLessEqual(get_text_width(truncated), 71)
|
||||
self.assertTrue(truncated.endswith('...'))
|
||||
self.assertNotEqual(truncated, self.MAINTAINER_CJK_LONG)
|
||||
|
||||
def test_maintainer_ascii_and_cjk_recap_rows_match_terminal_width(self):
|
||||
ascii_row = format_timing_row(
|
||||
self.MAINTAINER_ASCII_LONG, 0.01, self.COLUMNS, truncate=True,
|
||||
)
|
||||
cjk_row = format_timing_row(
|
||||
self.MAINTAINER_CJK_LONG, 0.01, self.COLUMNS, truncate=True,
|
||||
)
|
||||
self.assertEqual(get_text_width(ascii_row), self.LINE_WIDTH)
|
||||
self.assertEqual(get_text_width(cjk_row), self.LINE_WIDTH)
|
||||
self.assertIn('...', ascii_row)
|
||||
self.assertIn('...', cjk_row)
|
||||
|
||||
def test_format_timing_row_uses_dash_padding_for_timing_field(self):
|
||||
row = format_timing_row('Short task', 0.01, self.COLUMNS, truncate=True)
|
||||
self.assertTrue(row.endswith('--- 0.01s'))
|
||||
self.assertEqual(get_text_width(row), self.LINE_WIDTH)
|
||||
|
||||
def test_pad_to_display_width_handles_cjk(self):
|
||||
padded = pad_to_display_width(self.MAINTAINER_CJK_LONG[:5] + u' ', 71)
|
||||
self.assertEqual(get_text_width(padded), 71)
|
||||
self.assertTrue(padded.endswith('-'))
|
||||
|
||||
def test_format_timing_row_cjk_timing_suffix_matches_ascii(self):
|
||||
ascii_row = format_timing_row(self.MAINTAINER_ASCII_LONG, 0.01, self.COLUMNS, truncate=True)
|
||||
cjk_row = format_timing_row(self.MAINTAINER_CJK_LONG, 0.01, self.COLUMNS, truncate=True)
|
||||
self.assertTrue(ascii_row.endswith('--- 0.01s'))
|
||||
self.assertTrue(cjk_row.endswith('--- 0.01s'))
|
||||
self.assertNotIn('----', cjk_row)
|
||||
self.assertEqual(
|
||||
get_text_width(ascii_row[:ascii_row.rindex('.')]),
|
||||
get_text_width(cjk_row[:cjk_row.rindex('.')]),
|
||||
)
|
||||
Reference in New Issue
Block a user