IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-03 12:11:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipatests: update the expected output of user-add cmd

Browse Source 
The SID is not expected to be returned by ipa user-add.

Related: https://pagure.io/freeipa/issue/8995
Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Florence Blanc-Renaud 2021-10-21 15:22:25 +02:00
parent bede62bf19
commit cc8a0bc24c
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipatests/test_xmlrpc/test_idviews_plugin.py
View File

@ -217,7 +217,8 @@ class test_idviews(Declarative):
u'Test',
u'User1',
'add',
objectclass=objectclasses.user,
objectclass=fuzzy_set_optional_oc(
objectclasses.user, 'ipantuserattrs'),
),
),
),
@ -1623,7 +1624,8 @@ class test_idviews(Declarative):
u'Removed',
u'User',
'add',
objectclass=objectclasses.user,
objectclass=fuzzy_set_optional_oc(
objectclasses.user, 'ipantuserattrs'),
),
),
),

1
ipatests/test_xmlrpc/test_range_plugin.py
View File

@ -503,7 +503,6 @@ class test_range(Declarative):
uidnumber=[unicode(user1_uid)],
gidnumber=[unicode(user1_uid)],
objectclass=objectclasses.user_base + [u'mepOriginEntry'],
omit=['ipantsecurityidentifier'],
),
),
),

3
ipatests/test_xmlrpc/test_user_plugin.py
View File

@ -1182,6 +1182,9 @@ def get_user_result(uid, givenname, sn, operation='show', omit=[],
objectclass=objectclasses.user,
krbprincipalname=[u'%s@%s' % (uid, api.env.realm)],
krbcanonicalname=[u'%s@%s' % (uid, api.env.realm)],
)
if operation == 'show-all':
result.update(
ipantsecurityidentifier=[fuzzy_user_or_group_sid],
)
if operation in ('show', 'show-all', 'find', 'mod'):

5
ipatests/test_xmlrpc/tracker/user_plugin.py
View File

@ -11,6 +11,7 @@ import six
from ipatests.util import assert_deepequal, get_group_dn
from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import (
fuzzy_set_optional_oc,
fuzzy_digits, fuzzy_uuid, fuzzy_user_or_group_sid, raises_exact)
from ipatests.test_xmlrpc.tracker.base import Tracker
from ipatests.test_xmlrpc.tracker.kerberos_aliases import KerberosAliasMixin
@ -51,6 +52,7 @@ class UserTracker(CertmapdataMixin, KerberosAliasMixin, Tracker):
u'krbextradata', u'krbpasswordexpiration', u'krblastpwdchange',
u'krbprincipalkey', u'userpassword', u'randompassword'}
create_keys = create_keys - {u'nsaccountlock'}
create_keys = create_keys - {'ipantsecurityidentifier'}
update_keys = retrieve_keys - {u'dn'}
activate_keys = retrieve_keys
@ -175,7 +177,8 @@ class UserTracker(CertmapdataMixin, KerberosAliasMixin, Tracker):
displayname=[u'%s %s' % (self.givenname, self.sn)],
cn=[u'%s %s' % (self.givenname, self.sn)],
initials=[u'%s%s' % (self.givenname[0], self.sn[0])],
objectclass=objectclasses.user,
objectclass=fuzzy_set_optional_oc(
objectclasses.user, 'ipantuserattrs'),
description=[u'__no_upg__'],
ipauniqueid=[fuzzy_uuid],
uidnumber=[fuzzy_digits],