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

Fix error message for nonexistent members and add tests.

Browse Source 
https://fedorahosted.org/freeipa/ticket/4643

Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
David Kupka 2014-10-21 18:12:23 -04:00 committed by Tomas Babej
parent 2fc53c9426
commit 192c499ef8
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ipalib/plugins/automember.py
View File

@ -735,7 +735,10 @@ class automember_rebuild(Command):
names = options.get(opt_name)
if names:
for name in names:
obj.get_dn_if_exists(name)
try:
obj.get_dn_if_exists(name)
except errors.NotFound:
obj.handle_not_found(name)
search_filter = ldap.make_filter_from_attr(
obj.primary_key.name,
names,

35
ipatests/test_xmlrpc/test_automember_plugin.py
View File

@ -30,6 +30,7 @@ from ipatests.test_xmlrpc.test_user_plugin import get_user_result
user1 = u'tuser1'
user_does_not_exist = u'does_not_exist'
manager1 = u'mscott'
fqdn1 = u'web1.%s' % api.env.domain
short1 = u'web1'
@ -41,6 +42,7 @@ fqdn4 = u'www5.%s' % api.env.domain
short4 = u'www5'
fqdn5 = u'webserver5.%s' % api.env.domain
short5 = u'webserver5'
fqdn_does_not_exist = u'does_not_exist.%s' % api.env.domain
group1 = u'group1'
group1_dn = DN(('cn', group1), ('cn', 'groups'),
@ -1625,4 +1627,37 @@ class test_automember(Declarative):
),
),
dict(
desc='Rebuild membership with type hostgroup and --hosts',
command=('automember_rebuild', [], {u'type': u'hostgroup', u'hosts': fqdn1}),
expected=dict(
value=None,
summary=u'Automember rebuild task finished. Processed (1) entries.',
result={
}
),
),
dict(
desc='Rebuild membership with type group and --users',
command=('automember_rebuild', [], {u'type': u'group', u'users': user1}),
expected=dict(
value=None,
summary=u'Automember rebuild task finished. Processed (1) entries.',
result={
}
),
),
dict(
desc='Try to rebuild membership with invalid host in --hosts',
command=('automember_rebuild', [], {u'type': u'hostgroup', u'hosts': fqdn_does_not_exist}),
expected=errors.NotFound(reason='%s: host not found' % fqdn_does_not_exist),
),
dict(
desc='Try to rebuild membership with invalid user in --users',
command=('automember_rebuild', [], {u'type': u'group', u'users': user_does_not_exist}),
expected=errors.NotFound(reason='%s: user not found' % user_does_not_exist),
),
]