Translate the membergroup dn into a group name.

Drop filter from the output, it is superfluous.

ticket 634
This commit is contained in:
Rob Crittenden
2010-12-20 13:53:35 -05:00
committed by Adam Young
parent 3a9210f06f
commit ffd467bd7e
2 changed files with 29 additions and 21 deletions

View File

@@ -26,7 +26,7 @@ from tests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
delegation1 = u'testdelegation'
memberdn1 = u'cn=admins,cn=groups,cn=accounts,%s' % api.env.basedn
member1 = u'admins'
class test_delegation(Declarative):
@@ -89,8 +89,7 @@ class test_delegation(Declarative):
permissions=[u'write'],
aciname=delegation1,
group=u'editors',
membergroup=u'%s' % memberdn1,
filter = u'(memberOf=%s)' % memberdn1
membergroup=[member1],
),
),
),
@@ -121,8 +120,7 @@ class test_delegation(Declarative):
'permissions': [u'write'],
'aciname': delegation1,
'group': u'editors',
'filter': u'(memberOf=%s)' % memberdn1,
'membergroup': u'%s' % memberdn1
'membergroup': [member1],
},
),
),
@@ -141,8 +139,7 @@ class test_delegation(Declarative):
'permissions': [u'write'],
'aciname': delegation1,
'group': u'editors',
'membergroup': u'%s' % memberdn1,
'filter': u'(memberOf=%s)' % memberdn1
'membergroup': [member1],
},
],
),
@@ -162,8 +159,7 @@ class test_delegation(Declarative):
permissions=[u'read'],
aciname=delegation1,
group=u'editors',
membergroup=u'%s' % memberdn1,
filter=u'(memberOf=%s)' % memberdn1
membergroup=[member1],
),
),
),
@@ -180,8 +176,7 @@ class test_delegation(Declarative):
'permissions': [u'read'],
'aciname': delegation1,
'group': u'editors',
'membergroup': u'%s' % memberdn1,
'filter': u'(memberOf=%s)' % memberdn1
'membergroup': [member1],
},
),
),