Explicitly filter options that permission-{add,mod} passes to aci-{add,mod}

Make permission commands not pass options that the underlying ACI commands
do not understand.

Update tests.

Remove some extraneous imports of the `copy` module.

https://fedorahosted.org/freeipa/ticket/2885
This commit is contained in:
Petr Viktorin
2012-06-29 07:24:14 -04:00
committed by Martin Kosek
parent 50ebd1a339
commit 03f247ec86
5 changed files with 19 additions and 15 deletions

View File

@@ -304,6 +304,8 @@ class test_permission(Declarative):
'permission_add', [permission2], dict(
type=u'user',
permissions=u'write',
setattr=u'owner=cn=test',
addattr=u'owner=cn=test2',
)
),
expected=dict(
@@ -315,6 +317,7 @@ class test_permission(Declarative):
objectclass=objectclasses.permission,
type=u'user',
permissions=[u'write'],
owner=[u'cn=test', u'cn=test2'],
),
),
),
@@ -482,7 +485,12 @@ class test_permission(Declarative):
dict(
desc='Update %r' % permission1,
command=(
'permission_mod', [permission1], dict(permissions=u'read', memberof=u'ipausers')
'permission_mod', [permission1], dict(
permissions=u'read',
memberof=u'ipausers',
setattr=u'owner=cn=other-test',
addattr=u'owner=cn=other-test2',
)
),
expected=dict(
value=permission1,
@@ -494,6 +502,7 @@ class test_permission(Declarative):
type=u'user',
permissions=[u'read'],
memberof=u'ipausers',
owner=[u'cn=other-test', u'cn=other-test2'],
),
),
),