From 51b5d170234dfc695539ce3dca1f44157788416c Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud Date: Wed, 15 Apr 2026 15:42:53 +0200 Subject: [PATCH] ipa-4.13.1-3.2 - Resolves: RHEL-168516 TestIPAMigrationProdMode tests are missing Signed-off-by: Florence Blanc-Renaud --- ...nal-tests-for-ipa-ipa-migration-test.patch | 13 +---- 0035-ipatests-fix-migration-test.patch | 50 +++++++++++++++++++ freeipa.spec | 6 ++- 3 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 0035-ipatests-fix-migration-test.patch diff --git a/0029-ipatests-Additional-tests-for-ipa-ipa-migration-test.patch b/0029-ipatests-Additional-tests-for-ipa-ipa-migration-test.patch index 02a16b3..ce06fe2 100644 --- a/0029-ipatests-Additional-tests-for-ipa-ipa-migration-test.patch +++ b/0029-ipatests-Additional-tests-for-ipa-ipa-migration-test.patch @@ -60,7 +60,7 @@ index a550e8f208dc8e225cd73b58e6d71e1905174420..f759b15f2a9516550b7935897d8368d3 ] ) -@@ -293,6 +303,11 @@ def prepare_ipa_server(master): +@@ -293,6 +299,11 @@ def prepare_ipa_server(master): ] ) @@ -72,16 +72,7 @@ index a550e8f208dc8e225cd73b58e6d71e1905174420..f759b15f2a9516550b7935897d8368d3 def run_migrate( host, mode, remote_host, bind_dn=None, bind_pwd=None, extra_args=None - ): -@@ -664,15 +675,15 @@ class TestIPAMigrateCLIOptions(MigrationTest): - realm_name = self.master.domain.realm - base_dn = str(self.master.domain.basedn) - dse_ldif = textwrap.dedent( -- f""" -+ """ - dn: cn={realm_name},cn=kerberos,{base_dn} - cn: {realm_name} - objectClass: top +@@ -671,8 +682,8 @@ class TestIPAMigrateCLIOptions(MigrationTest): objectClass: krbrealmcontainer """ ).format( diff --git a/0035-ipatests-fix-migration-test.patch b/0035-ipatests-fix-migration-test.patch new file mode 100644 index 0000000..a00f922 --- /dev/null +++ b/0035-ipatests-fix-migration-test.patch @@ -0,0 +1,50 @@ +From 3d5fe37d41332cdca486c9ca42089934e5ed7f89 Mon Sep 17 00:00:00 2001 +From: Florence Blanc-Renaud +Date: Mon, 30 Mar 2026 10:39:51 +0200 +Subject: [PATCH] ipatests: fix migration test + +A previous commit modified the DNS zone forwarder's IP address +but forgot to change the expected value in the test. +Use a constant in the test setup and in the test expectation. + +Related: https://pagure.io/freeipa/issue/9964 +Signed-off-by: Florence Blanc-Renaud +Reviewed-By: Sudhir Menon +Reviewed-By: Sudhir Menon +--- + ipatests/test_integration/test_ipa_ipa_migration.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/ipatests/test_integration/test_ipa_ipa_migration.py b/ipatests/test_integration/test_ipa_ipa_migration.py +index e997f3683c70079af7633b578d5523b646c0f36c..952109239792d34283b282cf16c35e495cb64d1e 100644 +--- a/ipatests/test_integration/test_ipa_ipa_migration.py ++++ b/ipatests/test_integration/test_ipa_ipa_migration.py +@@ -15,6 +15,7 @@ import pytest + import re + import textwrap + ++TEST_ZONE_FORWARDER = "10.11.12.13" + + def prepare_ipa_server(master): + """ +@@ -227,7 +228,7 @@ def prepare_ipa_server(master): + "dnsforwardzone-add", + "forwardzone.test", + "--forwarder", +- "192.168.124.10", ++ TEST_ZONE_FORWARDER, + ] + ) + +@@ -827,7 +828,7 @@ class TestIPAMigrateCLIOptions(MigrationTest): + ) + assert 'Zone name: {}'.format(zone_name) in result.stdout_text + assert 'Active zone: True' in result.stdout_text +- assert 'Zone forwarders: 10.11.12.13' in result.stdout_text ++ assert f'Zone forwarders: {TEST_ZONE_FORWARDER}' in result.stdout_text + assert 'Forward policy: first' in result.stdout_text + + def test_ipa_migrate_version_option(self): +-- +2.53.0 + diff --git a/freeipa.spec b/freeipa.spec index b4c9839..569e7e5 100644 --- a/freeipa.spec +++ b/freeipa.spec @@ -234,7 +234,7 @@ Name: %{package_name} Version: %{IPA_VERSION} -Release: 3%{?rc_version:.%rc_version}%{?dist}.1 +Release: 3%{?rc_version:.%rc_version}%{?dist}.2 Summary: The Identity, Policy and Audit system License: GPL-3.0-or-later @@ -296,6 +296,7 @@ Patch0031: 0031-ipatests-Add-ipa-selfservice-show-and-selfservice-mo.patch Patch0032: 0032-ipatests-Add-selfservice-find-cli-tests-to-xmlrpc-Ad.patch Patch0033: 0033-ipatest-make-tests-compatible-with-Pytest-9.patch Patch0034: 0034-ipatests-fix-the-method-add_a_record.patch +Patch0035: 0035-ipatests-fix-migration-test.patch Patch1001: 1001-Change-branding-to-IPA-and-Identity-Management.patch %endif %endif @@ -2005,6 +2006,9 @@ fi %endif %changelog +* Wed Apr 15 2026 Florence Blanc-Renaud - 4.13.1-3.2 +- Resolves: RHEL-168516 TestIPAMigrationProdMode tests are missing + * Fri Apr 10 2026 Florence Blanc-Renaud - 4.13.1-3.1 - Resolves: RHEL-155027 Adding a group with 32Bit Idrange fails - Resolves: RHEL-153145 IdM password policy Min lifetime is not enforced when high minlife is set