From b6520bef2ef05dd87636d8b57e3247d451af81d8 Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud Date: Tue, 14 Dec 2021 16:33:29 +0100 Subject: [PATCH] ipatests: Fix expected object classes 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 expected object classes. Related: https://pagure.io/freeipa/issue/9062 Signed-off-by: Florence Blanc-Renaud Reviewed-By: Rob Crittenden Reviewed-By: Alexander Bokovoy Reviewed-By: Stanislav Levin --- ipatests/test_xmlrpc/test_user_plugin.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/ipatests/test_xmlrpc/test_user_plugin.py b/ipatests/test_xmlrpc/test_user_plugin.py index 74d78b0c6d75590640da1357da1f9f4570307878..c156a8793c5765df96029753f4a278e961d4e895 100644 --- a/ipatests/test_xmlrpc/test_user_plugin.py +++ b/ipatests/test_xmlrpc/test_user_plugin.py @@ -125,7 +125,9 @@ def user_npg(request, group): del tracker.attrs['mepmanagedentry'] tracker.attrs.update( description=[], memberof_group=[group.cn], - objectclass=objectclasses.user_base + [u'ipantuserattrs'], + objectclass=fuzzy_set_optional_oc( + objectclasses.user_base, 'ipantuserattrs' + ), ) return tracker.make_fixture(request) @@ -139,7 +141,9 @@ def user_npg2(request, group): del tracker.attrs['mepmanagedentry'] tracker.attrs.update( gidnumber=[u'1000'], description=[], memberof_group=[group.cn], - objectclass=objectclasses.user_base + [u'ipantuserattrs'], + objectclass=fuzzy_set_optional_oc( + objectclasses.user_base, 'ipantuserattrs' + ), ) return tracker.make_fixture(request) @@ -151,8 +155,9 @@ def user_radius(request, xmlrpc_setup): sn=u'radiususer1', ipatokenradiususername=u'radiususer') tracker.track_create() - tracker.attrs.update( - objectclass=objectclasses.user + [u'ipatokenradiusproxyuser'] + tracker.attrs.update(objectclass=fuzzy_set_optional_oc( + objectclasses.user + [u'ipatokenradiusproxyuser'], + 'ipantuserattrs'), ) return tracker.make_fixture(request) @@ -647,7 +652,8 @@ class TestCreate(XMLRPC_test): testuser.attrs.update(gidnumber=[u'1000']) testuser.attrs.update( description=[], - objectclass=objectclasses.user_base + [u'ipantuserattrs'] + objectclass=fuzzy_set_optional_oc( + objectclasses.user_base, 'ipantuserattrs'), ) command = testuser.make_create_command() result = command() @@ -865,7 +871,9 @@ class TestUserWithUPGDisabled(XMLRPC_test): testuser.attrs.update(gidnumber=[u'1000']) testuser.attrs.update( description=[], - objectclass=objectclasses.user_base + [u'ipantuserattrs'], + objectclass=fuzzy_set_optional_oc( + objectclasses.user_base, 'ipantuserattrs' + ), ) command = testuser.make_create_command() result = command() -- 2.37.2