- Fix test_pwpolicy for https://pagure.io/freeipa/issue/9297
Related: RHEL-13744
This commit is contained in:
parent
ae3370cb23
commit
1cb62975ae
@ -0,0 +1,47 @@
|
|||||||
|
From f2a1d50b82cb8af31e5d55c045c8dc72c98c7694 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Woerner <twoerner@redhat.com>
|
||||||
|
Date: Tue, 28 Nov 2023 11:48:31 +0100
|
||||||
|
Subject: [PATCH] test_pwpolicy: minlength parameter can be reset with empty
|
||||||
|
string now
|
||||||
|
|
||||||
|
The reset of the minlength parameter failed with an internal error so
|
||||||
|
far. This has been fixed in IPA and therefore requires to fix the test
|
||||||
|
in ansible-freeipa also.
|
||||||
|
|
||||||
|
Related: https://pagure.io/freeipa/issue/9297
|
||||||
|
---
|
||||||
|
tests/pwpolicy/test_pwpolicy.yml | 17 +++--------------
|
||||||
|
1 file changed, 3 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tests/pwpolicy/test_pwpolicy.yml b/tests/pwpolicy/test_pwpolicy.yml
|
||||||
|
index 83f1763..340f64f 100644
|
||||||
|
--- a/tests/pwpolicy/test_pwpolicy.yml
|
||||||
|
+++ b/tests/pwpolicy/test_pwpolicy.yml
|
||||||
|
@@ -176,21 +176,10 @@
|
||||||
|
minlength: ""
|
||||||
|
register: result
|
||||||
|
failed_when:
|
||||||
|
- result.changed or
|
||||||
|
(result.failed and not
|
||||||
|
- ("an internal error has occurred" in result.msg or
|
||||||
|
- "int() argument must be" in result.msg))
|
||||||
|
- when: ipa_version is version("4.9", ">=")
|
||||||
|
-
|
||||||
|
- - name: Ensure minlength is not cleared due to FreeIPA issue
|
||||||
|
- ipapwpolicy:
|
||||||
|
- ipaadmin_password: SomeADMINpassword
|
||||||
|
- ipaapi_context: "{{ ipa_context | default(omit) }}"
|
||||||
|
- name: ops
|
||||||
|
- minlength: ""
|
||||||
|
- register: result
|
||||||
|
- failed_when: not result.changed or result.failed
|
||||||
|
- when: ipa_version is version("4.7", "<")
|
||||||
|
+ ("an internal error has occurred" in result.msg or
|
||||||
|
+ "int() argument must be" in result.msg))
|
||||||
|
+ or (not result.failed and not result.changed)
|
||||||
|
|
||||||
|
- name: Execute tests if ipa_version >= 4.9.0
|
||||||
|
when: ipa_version is version("4.9", ">=")
|
||||||
|
--
|
||||||
|
2.42.0
|
||||||
|
|
@ -8,10 +8,11 @@
|
|||||||
Summary: Roles and playbooks to deploy FreeIPA servers, replicas and clients
|
Summary: Roles and playbooks to deploy FreeIPA servers, replicas and clients
|
||||||
Name: ansible-freeipa
|
Name: ansible-freeipa
|
||||||
Version: 1.12.0
|
Version: 1.12.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
URL: https://github.com/freeipa/ansible-freeipa
|
URL: https://github.com/freeipa/ansible-freeipa
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
Source: https://github.com/freeipa/ansible-freeipa/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source: https://github.com/freeipa/ansible-freeipa/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
|
Patch0: ansible-freeipa-1.12.0-test_pwpolicy-minlength-parameter-can-be-reset-with-.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
|
%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
|
||||||
Requires: ansible-core
|
Requires: ansible-core
|
||||||
@ -121,6 +122,7 @@ to get the needed requrements to run the tests.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
# Do not create backup files with patches
|
# Do not create backup files with patches
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
# Fix python modules and module utils:
|
# Fix python modules and module utils:
|
||||||
# - Remove shebang
|
# - Remove shebang
|
||||||
@ -186,6 +188,10 @@ cp -rp tests %{buildroot}%{_datadir}/ansible-freeipa/
|
|||||||
%{_datadir}/ansible-freeipa/requirements-tests.txt
|
%{_datadir}/ansible-freeipa/requirements-tests.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 28 2023 Thomas Woerner <twoerner@redhat.com> - 1.12.0-2
|
||||||
|
- Fix test_pwpolicy for https://pagure.io/freeipa/issue/9297
|
||||||
|
Related: RHEL-13744
|
||||||
|
|
||||||
* Mon Nov 27 2023 Thomas Woerner <twoerner@redhat.com> - 1.12.0-1
|
* Mon Nov 27 2023 Thomas Woerner <twoerner@redhat.com> - 1.12.0-1
|
||||||
- Update to version 1.12.0
|
- Update to version 1.12.0
|
||||||
https://github.com/freeipa/ansible-freeipa/releases/tag/v1.12.0
|
https://github.com/freeipa/ansible-freeipa/releases/tag/v1.12.0
|
||||||
|
Loading…
Reference in New Issue
Block a user