From 29f4b4fad1819887265018552fe5ea785610b403 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 28 Nov 2023 14:54:58 +0100
Subject: [PATCH] - Fix test_pwpolicy for https://pagure.io/freeipa/issue/9297 
  Related: RHEL-13746

---
 ...nlength-parameter-can-be-reset-with-.patch | 47 +++++++++++++++++++
 ansible-freeipa.spec                          |  8 +++-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 ansible-freeipa-1.12.0-test_pwpolicy-minlength-parameter-can-be-reset-with-.patch

diff --git a/ansible-freeipa-1.12.0-test_pwpolicy-minlength-parameter-can-be-reset-with-.patch b/ansible-freeipa-1.12.0-test_pwpolicy-minlength-parameter-can-be-reset-with-.patch
new file mode 100644
index 0000000..f4e18a3
--- /dev/null
+++ b/ansible-freeipa-1.12.0-test_pwpolicy-minlength-parameter-can-be-reset-with-.patch
@@ -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
+
diff --git a/ansible-freeipa.spec b/ansible-freeipa.spec
index a68f311..95b9b88 100644
--- a/ansible-freeipa.spec
+++ b/ansible-freeipa.spec
@@ -8,10 +8,11 @@
 Summary: Roles and playbooks to deploy FreeIPA servers, replicas and clients
 Name: ansible-freeipa
 Version: 1.12.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: https://github.com/freeipa/ansible-freeipa
 License: GPL-3.0-or-later
 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
 
 %description
@@ -118,6 +119,7 @@ to get the needed requrements to run the tests.
 %prep
 %setup -q
 # Do not create backup files with patches
+%patch0 -p1
 
 # Fix python modules and module utils:
 # - Remove shebang
@@ -183,6 +185,10 @@ cp -rp tests %{buildroot}%{_datadir}/ansible-freeipa/
 %{_datadir}/ansible-freeipa/requirements-tests.txt
 
 %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-13746
+
 * Mon Nov 27 2023 Thomas Woerner <twoerner@redhat.com> - 1.12.0-1
 - Update to version 1.12.0
   https://github.com/freeipa/ansible-freeipa/releases/tag/v1.12.0