summaryrefslogtreecommitdiffstats
path: root/ipatests/test_xmlrpc/test_permission_plugin.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2014-06-19 19:06:19 +0200
committerPetr Viktorin <pviktori@redhat.com>2014-06-23 10:54:42 +0200
commit013bf3d4e282643ca1c424b4afc42237093ec412 (patch)
tree58626cef796f43f89c3b99ac2f407b72e7c829de /ipatests/test_xmlrpc/test_permission_plugin.py
parentf486d23ad67a7337c7633e4216c5a0b0374002fc (diff)
downloadfreeipa-013bf3d4e282643ca1c424b4afc42237093ec412.tar.gz
freeipa-013bf3d4e282643ca1c424b4afc42237093ec412.tar.xz
freeipa-013bf3d4e282643ca1c424b4afc42237093ec412.zip
Test and docstring fixes
The recent conversions to managed permissions left behind a few failing tests. Fix them. Also fix a now incorrect docstring in ipalib.config. Reviewed-By: Martin Kosek <mkosek@redhat.com>
Diffstat (limited to 'ipatests/test_xmlrpc/test_permission_plugin.py')
-rw-r--r--ipatests/test_xmlrpc/test_permission_plugin.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py
index a37876bea..feffc2eb1 100644
--- a/ipatests/test_xmlrpc/test_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_permission_plugin.py
@@ -758,9 +758,9 @@ class test_permission(Declarative):
summary=u'2 permissions matched',
result=[
{
- 'dn': DN(('cn','Modify Group Password Policy'),
+ 'dn': DN(('cn', 'System: Modify Group Password Policy'),
api.env.container_permission, api.env.basedn),
- 'cn': [u'Modify Group Password Policy'],
+ 'cn': [u'System: Modify Group Password Policy'],
},
{
'dn': DN(('cn', 'System: Read Group Password Policy'),
@@ -1193,10 +1193,10 @@ class test_permission(Declarative):
summary=u'1 permission matched',
result=[
{
- 'dn': DN(('cn','Add user to default group'),
+ 'dn': DN(('cn', 'System: Add User to default group'),
api.env.container_permission, api.env.basedn),
- 'cn': [u'Add user to default group'],
- 'objectclass': objectclasses.system_permission,
+ 'cn': [u'System: Add User to default group'],
+ 'objectclass': objectclasses.permission,
'member_privilege': [u'User Administrators'],
'attrs': [u'member'],
'targetgroup': [u'ipausers'],
@@ -1206,7 +1206,9 @@ class test_permission(Declarative):
'ipapermtarget': [DN(
'cn=ipausers', api.env.container_group,
api.env.basedn)],
- 'ipapermlocation': [api.env.basedn],
+ 'ipapermlocation': [groups_dn],
+ 'ipapermdefaultattr': [u'member'],
+ 'ipapermissiontype': [u'V2', u'MANAGED', u'SYSTEM'],
}
],
),