URL: https://github.com/freeipa/freeipa/pull/6078 Author: flo-renaud Title: #6078: [Backport][ipa-4-9] ipatests: fix get_user_result method Action: opened
PR body: """ This PR was opened automatically because PR #6077 was pushed to master and backport to ipa-4-9 is required. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/6078/head:pr6078 git checkout pr6078
From 7c1c7cc1a7e54e18c9c38204a7a56f3f5efa7687 Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud <f...@redhat.com> Date: Wed, 10 Nov 2021 10:54:37 +0100 Subject: [PATCH] ipatests: fix get_user_result method Because the sidgen plugin is a postop plugin, it is not always triggered before the result of an ADD is returned and the objectclasses of the user may / may not contain ipantuserattrs. Fix the get_user_result method to work in all the cases. Related: https://pagure.io/freeipa/issue/8995 Signed-off-by: Florence Blanc-Renaud <f...@redhat.com> --- ipatests/test_xmlrpc/test_user_plugin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ipatests/test_xmlrpc/test_user_plugin.py b/ipatests/test_xmlrpc/test_user_plugin.py index b093a9f2b2d..58996b2132e 100644 --- a/ipatests/test_xmlrpc/test_user_plugin.py +++ b/ipatests/test_xmlrpc/test_user_plugin.py @@ -38,7 +38,7 @@ assert_deepequal, assert_equal, assert_not_equal, raises) from ipatests.test_xmlrpc.xmlrpc_test import ( XMLRPC_test, fuzzy_digits, fuzzy_uuid, fuzzy_password, - fuzzy_user_or_group_sid, + fuzzy_user_or_group_sid, fuzzy_set_optional_oc, Fuzzy, fuzzy_dergeneralizedtime, raises_exact) from ipapython.dn import DN from ipapython.ipaldap import ldap_initialize @@ -1179,7 +1179,8 @@ def get_user_result(uid, givenname, sn, operation='show', omit=[], initials=[givenname[0] + (sn or '')[:1]], ipauniqueid=[fuzzy_uuid], mepmanagedentry=[get_group_dn(uid)], - objectclass=objectclasses.user, + objectclass=fuzzy_set_optional_oc( + objectclasses.user, 'ipantuserattrs'), krbprincipalname=[u'%s@%s' % (uid, api.env.realm)], krbcanonicalname=[u'%s@%s' % (uid, api.env.realm)], )
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
