ipatests: Update ipa-adtrust-install test
Additional commit bacported to fix test automation. Resolves: RHEL-40894
This commit is contained in:
parent
e2ceb15ca1
commit
9fadb53aa0
@ -28,3 +28,45 @@ index 72e8d87..de252db 100644
|
|||||||
self.master.run_command(
|
self.master.run_command(
|
||||||
["chcon", "-t", "samba_share_t",
|
["chcon", "-t", "samba_share_t",
|
||||||
|
|
||||||
|
From 47920e78c81380c0a40986e55f05246aac132fbb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Erik Belko <ebelko@redhat.com>
|
||||||
|
Date: May 21 2024 12:50:46 +0000
|
||||||
|
Subject: ipatests: Update ipa-adtrust-install test
|
||||||
|
|
||||||
|
|
||||||
|
update after change in implementation of `krb_utils.get_principal()` now using GSSAPI
|
||||||
|
|
||||||
|
Related: https://pagure.io/freeipa/issue/9575
|
||||||
|
|
||||||
|
Signed-off-by: Erik Belko <ebelko@redhat.com>
|
||||||
|
Reviewed-By: Michal Polovka <mpolovka@redhat.com>
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/ipatests/test_integration/test_adtrust_install.py b/ipatests/test_integration/test_adtrust_install.py
|
||||||
|
index 86d8d20..72e8d87 100644
|
||||||
|
--- a/ipatests/test_integration/test_adtrust_install.py
|
||||||
|
+++ b/ipatests/test_integration/test_adtrust_install.py
|
||||||
|
@@ -464,18 +464,15 @@ class TestIpaAdTrustInstall(IntegrationTest):
|
||||||
|
password
|
||||||
|
"""
|
||||||
|
password = "wrong_pwd"
|
||||||
|
- msg = (
|
||||||
|
- "Must have Kerberos credentials to setup AD trusts on server: "
|
||||||
|
- "Major (458752): No credentials were supplied, or the credentials "
|
||||||
|
- "were unavailable or inaccessible, Minor (2529639053): "
|
||||||
|
- "No Kerberos credentials available (default cache: KCM:)\n"
|
||||||
|
+ expected_substring = (
|
||||||
|
+ "Must have Kerberos credentials to setup AD trusts on server:"
|
||||||
|
)
|
||||||
|
self.master.run_command(["kdestroy", "-A"])
|
||||||
|
result = self.master.run_command(
|
||||||
|
["ipa-adtrust-install", "-A", "admin", "-a",
|
||||||
|
password, "-U"], raiseonerr=False
|
||||||
|
)
|
||||||
|
- assert msg in result.stderr_text
|
||||||
|
+ assert expected_substring in result.stderr_text
|
||||||
|
assert result.returncode != 0
|
||||||
|
|
||||||
|
def test_adtrust_install_with_invalid_rid_base_value(self):
|
||||||
|
|
||||||
|
6
ipa.spec
6
ipa.spec
@ -190,7 +190,7 @@
|
|||||||
|
|
||||||
Name: %{package_name}
|
Name: %{package_name}
|
||||||
Version: %{IPA_VERSION}
|
Version: %{IPA_VERSION}
|
||||||
Release: 13%{?rc_version:.%rc_version}%{?dist}
|
Release: 14%{?rc_version:.%rc_version}%{?dist}
|
||||||
Summary: The Identity, Policy and Audit system
|
Summary: The Identity, Policy and Audit system
|
||||||
|
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
@ -1762,6 +1762,10 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 27 2024 Rafael Jeffman <rjeffman@redhat.com> - 4.9.13-14
|
||||||
|
- ipatests: Update ipa-adtrust-install test
|
||||||
|
Resolves: RHEL-40894
|
||||||
|
|
||||||
* Thu Nov 14 2024 Rafael Jeffman <rjeffman@redhat.com> - 4.9.13-13
|
* Thu Nov 14 2024 Rafael Jeffman <rjeffman@redhat.com> - 4.9.13-13
|
||||||
- Add ipa-idrange-fix
|
- Add ipa-idrange-fix
|
||||||
Resolves: RHEL-56920
|
Resolves: RHEL-56920
|
||||||
|
Loading…
Reference in New Issue
Block a user