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

Return reason for failure when updating group membership fails.

Browse Source 
We used to return a list of dns that failed to be added. We now return
a list of tuples instead. The tuple looks like (dn, reason) where reason
is the exception that was returned.

Also made the label we use for failures to be singular instead of plural
since we now print them out individually instead of as comma-separated.

ticket 270
This commit is contained in:
Rob Crittenden
2010-10-27 12:07:53 -04:00
parent 7486ead6c9
commit 3c795f3251
7 changed files with 78 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/test_xmlrpc/test_netgroup_plugin.py
View File

@@ -35,6 +35,16 @@ netgroup_dn = None
# See if our LDAP server is up and we can talk to it over GSSAPI
ccache = krbV.default_context().default_ccache().name
def entry_in_failed(entry, failed):
"""
entry is what we're looking for
failed is a tuple of tuples of the form (failure, exception)
"""
for f in failed:
if entry == f[0]:
return True
return False
class test_netgroup(XMLRPC_test):
"""
Test the `netgroup` plugin.
@@ -150,7 +160,7 @@ class test_netgroup(XMLRPC_test):
failed = ret['failed']
assert 'memberhost' in failed
assert 'host' in failed['memberhost']
assert self.host_fqdn in failed['memberhost']['host']
assert entry_in_failed(self.host_fqdn, failed['memberhost']['host'])
kw = {'raw': True}
kw['hostgroup'] = self.hg_cn
@@ -159,7 +169,7 @@ class test_netgroup(XMLRPC_test):
failed = ret['failed']
assert 'memberhost' in failed
assert 'hostgroup' in failed['memberhost']
assert self.hg_cn in failed['memberhost']['hostgroup']
assert entry_in_failed(self.hg_cn, failed['memberhost']['hostgroup'])
kw = {'raw': True}
kw['user'] = self.user_uid
@@ -168,7 +178,7 @@ class test_netgroup(XMLRPC_test):
failed = ret['failed']
assert 'memberuser' in failed
assert 'user' in failed['memberuser']
assert self.user_uid in failed['memberuser']['user']
assert entry_in_failed(self.user_uid, failed['memberuser']['user'])
kw = {'raw': True}
kw['group'] = self.group_cn
@@ -177,7 +187,7 @@ class test_netgroup(XMLRPC_test):
failed = ret['failed']
assert 'memberuser' in failed
assert 'group' in failed['memberuser']
assert self.group_cn in failed['memberuser']['group']
assert entry_in_failed(self.group_cn, failed['memberuser']['group'])
def test_5_netgroup_add_member(self):
"""
@@ -301,7 +311,7 @@ class test_netgroup(XMLRPC_test):
failed = ret['failed']
assert 'memberhost' in failed
assert 'host' in failed['memberhost']
assert self.host_fqdn in failed['memberhost']['host']
assert entry_in_failed(self.host_fqdn, failed['memberhost']['host'])
kw = {'raw': True}
kw['hostgroup'] = self.hg_cn
@@ -310,7 +320,7 @@ class test_netgroup(XMLRPC_test):
failed = ret['failed']
assert 'memberhost' in failed
assert 'hostgroup' in failed['memberhost']
assert self.hg_cn in failed['memberhost']['hostgroup']
assert entry_in_failed(self.hg_cn, failed['memberhost']['hostgroup'])
kw = {'raw': True}
kw['user'] = self.user_uid
@@ -320,7 +330,7 @@ class test_netgroup(XMLRPC_test):
failed = ret['failed']
assert 'memberuser' in failed
assert 'user' in failed['memberuser']
assert self.user_uid in failed['memberuser']['user']
assert entry_in_failed(self.user_uid, failed['memberuser']['user'])
kw = {'raw': True}
kw['group'] = self.group_cn
@@ -329,7 +339,7 @@ class test_netgroup(XMLRPC_test):
failed = ret['failed']
assert 'memberuser' in failed
assert 'group' in failed['memberuser']
assert self.group_cn in failed['memberuser']['group']
assert entry_in_failed(self.group_cn, failed['memberuser']['group'])
def test_b_netgroup_del(self):
"""