diff options
Diffstat (limited to 'tests/test_xmlrpc/test_permission_plugin.py')
| -rw-r--r-- | tests/test_xmlrpc/test_permission_plugin.py | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/tests/test_xmlrpc/test_permission_plugin.py b/tests/test_xmlrpc/test_permission_plugin.py index 4ee466b65..a116a66ea 100644 --- a/tests/test_xmlrpc/test_permission_plugin.py +++ b/tests/test_xmlrpc/test_permission_plugin.py @@ -25,28 +25,25 @@ Test the `ipalib/plugins/permission.py` module. from ipalib import api, errors from tests.test_xmlrpc import objectclasses from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid +from ipalib.dn import * permission1 = u'testperm' -permission1_dn = u'cn=%s,%s,%s' % (permission1, - api.env.container_permission,api.env.basedn, -) +permission1_dn = DN(('cn',permission1), + api.env.container_permission,api.env.basedn) permission1_renamed = u'testperm1_rn' -permission1_renamed_dn = u'cn=%s,%s,%s' % (permission1_renamed, - api.env.container_permission,api.env.basedn, -) +permission1_renamed_dn = DN(('cn',permission1_renamed), + api.env.container_permission,api.env.basedn) permission2 = u'testperm2' -permission2_dn = u'cn=%s,%s,%s' % (permission2, - api.env.container_permission,api.env.basedn, -) +permission2_dn = DN(('cn',permission2), + api.env.container_permission,api.env.basedn) privilege1 = u'testpriv1' -privilege1_dn = u'cn=%s,%s,%s' % ( - privilege1, api.env.container_privilege, api.env.basedn -) +privilege1_dn = DN(('cn',privilege1), + api.env.container_privilege,api.env.basedn) class test_permission(Declarative): @@ -104,7 +101,7 @@ class test_permission(Declarative): value=permission1, summary=u'Added permission "%s"' % permission1, result=dict( - dn=permission1_dn, + dn=lambda x: DN(x) == permission1_dn, cn=[permission1], objectclass=objectclasses.permission, type=u'user', @@ -135,7 +132,7 @@ class test_permission(Declarative): value=privilege1, summary=u'Added privilege "%s"' % privilege1, result=dict( - dn=privilege1_dn, + dn=lambda x: DN(x) == privilege1_dn, cn=[privilege1], description=[u'privilege desc. 1'], objectclass=objectclasses.privilege, @@ -157,7 +154,7 @@ class test_permission(Declarative): ), ), result={ - 'dn': privilege1_dn, + 'dn': lambda x: DN(x) == privilege1_dn, 'cn': [privilege1], 'description': [u'privilege desc. 1'], 'memberof_permission': [permission1], @@ -173,7 +170,7 @@ class test_permission(Declarative): value=permission1, summary=None, result={ - 'dn': permission1_dn, + 'dn': lambda x: DN(x) == permission1_dn, 'cn': [permission1], 'member_privilege': [privilege1], 'type': u'user', @@ -192,7 +189,7 @@ class test_permission(Declarative): summary=u'1 permission matched', result=[ { - 'dn': permission1_dn, + 'dn': lambda x: DN(x) == permission1_dn, 'cn': [permission1], 'member_privilege': [privilege1], 'type': u'user', @@ -212,7 +209,7 @@ class test_permission(Declarative): summary=u'1 permission matched', result=[ { - 'dn': permission1_dn, + 'dn': lambda x: DN(x) == permission1_dn, 'cn': [permission1], 'member_privilege': [privilege1], 'type': u'user', @@ -235,7 +232,7 @@ class test_permission(Declarative): value=permission2, summary=u'Added permission "%s"' % permission2, result=dict( - dn=permission2_dn, + dn=lambda x: DN(x) == permission2_dn, cn=[permission2], objectclass=objectclasses.permission, type=u'user', @@ -254,14 +251,14 @@ class test_permission(Declarative): summary=u'2 permissions matched', result=[ { - 'dn': permission1_dn, + 'dn': lambda x: DN(x) == permission1_dn, 'cn': [permission1], 'member_privilege': [privilege1], 'type': u'user', 'permissions': [u'write'], }, { - 'dn': permission2_dn, + 'dn': lambda x: DN(x) == permission2_dn, 'cn': [permission2], 'type': u'user', 'permissions': [u'write'], @@ -280,7 +277,7 @@ class test_permission(Declarative): summary=u'1 privilege matched', result=[ { - 'dn': privilege1_dn, + 'dn': lambda x: DN(x) == privilege1_dn, 'cn': [privilege1], 'description': [u'privilege desc. 1'], 'memberof_permission': [permission1], @@ -299,7 +296,7 @@ class test_permission(Declarative): value=permission1, summary=u'Modified permission "%s"' % permission1, result=dict( - dn=permission1_dn, + dn=lambda x: DN(x) == permission1_dn, cn=[permission1], member_privilege=[privilege1], type=u'user', @@ -316,7 +313,7 @@ class test_permission(Declarative): value=permission1, summary=None, result={ - 'dn': permission1_dn, + 'dn': lambda x: DN(x) == permission1_dn, 'cn': [permission1], 'member_privilege': [privilege1], 'type': u'user', @@ -345,7 +342,7 @@ class test_permission(Declarative): value=permission1, summary=None, result={ - 'dn': permission1_dn, + 'dn': lambda x: DN(x) == permission1_dn, 'cn': [permission1], 'member_privilege': [privilege1], 'type': u'user', @@ -366,7 +363,7 @@ class test_permission(Declarative): value=permission1, summary=u'Modified permission "%s"' % permission1, result={ - 'dn': permission1_renamed_dn, + 'dn': lambda x: DN(x) == permission1_renamed_dn, 'cn': [permission1_renamed], 'member_privilege': [privilege1], 'type': u'user', |