From 886934eaba14a4dd711e2fa8929bb73830533016 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 --- ipatests/test_xmlrpc/test_user_plugin.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ipatests/test_xmlrpc/test_user_plugin.py b/ipatests/test_xmlrpc/test_user_plugin.py index 58996b2132e..b9fed22f30b 100644 --- a/ipatests/test_xmlrpc/test_user_plugin.py +++ b/ipatests/test_xmlrpc/test_user_plugin.py @@ -151,8 +151,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) @@ -646,7 +647,8 @@ def test_create_without_upg_with_gid_set(self): 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()