Make tests compatible with sssd_krb5_locator_plugin.so

0013-downstream-Make-tests-compatible-with-sssd_krb5_loca.patch

@@ -0,0 +1,41 @@
+From 9a536113196d8b32e3143964a655356ac8af1347 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Wed, 7 Dec 2022 13:22:42 +0100
+Subject: [PATCH] [downstream] Make tests compatible with
+ sssd_krb5_locator_plugin.so
+
+The sssd_krb5_locator_plugin.so plugin provided by sssd-client conflicts
+with the upstream test t_discover_uri.py. The test has to be modified in
+order to avoid false positive.
+---
+ src/lib/krb5/os/t_discover_uri.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/krb5/os/t_discover_uri.py b/src/lib/krb5/os/t_discover_uri.py
+index 87bac17929..26bc95a8dc 100644
+--- a/src/lib/krb5/os/t_discover_uri.py
++++ b/src/lib/krb5/os/t_discover_uri.py
+@@ -1,3 +1,4 @@
++from os.path import exists
+ from k5test import *
+ 
+ entries = ('URI _kerberos.TEST krb5srv::kkdcp:https://kdc1 1 1\n',
+@@ -37,8 +38,14 @@ realm.env['RESOLV_WRAPPER_HOSTS'] = hosts_filename
+ out = realm.run(['./t_locate_kdc', 'TEST'], env=realm.env)
+ l = out.splitlines()
+ 
++if (exists('/usr/lib/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so')
++    or exists('/usr/lib64/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so')):
++    line_range = range(6, 14)
++else:
++    line_range = range(4, 12)
++
+ j = 0
+-for i in range(4, 12):
++for i in line_range:
+     if l[i].strip() != expected[j]:
+         fail('URI answers do not match')
+     j += 1
+-- 
+2.38.1
+

krb5.spec

@@ -10,7 +10,7 @@
 #
 # baserelease is what we have standardized across Fedora and what
 # rpmdev-bumpspec knows how to handle.
-%global baserelease 3
+%global baserelease 4
 
 # This should be e.g. beta1 or %%nil
 %global pre_release %nil
@@ -71,6 +71,7 @@ Patch9:  0009-Simplify-plugin-loading-code.patch
 Patch10: 0010-Update-error-checking-for-OpenSSL-CMS_verify.patch
 Patch11: 0011-downstream-Catch-SHA-1-digest-disallowed-error-for-P.patch
 Patch12: 0012-Add-and-use-ts_interval-helper.patch
+Patch13: 0013-downstream-Make-tests-compatible-with-sssd_krb5_loca.patch
 
 License: MIT
 URL: https://web.mit.edu/kerberos/www/
@@ -254,9 +255,6 @@ Requires: /etc/crypto-policies/back-ends/krb5.config
 Requires: /usr/share/dict/words
 #Requires: openldap-servers, openldap-clients
 
-# sssd_krb5_locator_plugin.so conflicts with t_discover_uri.py
-Conflicts: sssd-client
-
 %description tests
 FOR TESTING PURPOSE ONLY
 Test sources for krb5 build, with pre-defined compilation parameters
@@ -710,6 +708,9 @@ exit 0
 %{_datarootdir}/%{name}-tests/
 
 %changelog
+* Tue Dec 20 2022 Julien Rische <jrische@redhat.com> - 1.20.1-4
+- Make tests compatible with sssd_krb5_locator_plugin.so
+
 * Tue Dec 06 2022 Julien Rische <jrische@redhat.com> - 1.20.1-3
 - Enable TMT integration with Fedora CI
 

plans/tests.fmf

@@ -1,9 +1,5 @@
 summary: Tests
 discover:
   how: fmf
-prepare:
-- how: shell
-  script:
-  - dnf remove -y sssd-client
 execute:
   how: tmt