diff options
Diffstat (limited to 'ipatests/test_xmlrpc/test_old_permission_plugin.py')
-rw-r--r-- | ipatests/test_xmlrpc/test_old_permission_plugin.py | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/ipatests/test_xmlrpc/test_old_permission_plugin.py b/ipatests/test_xmlrpc/test_old_permission_plugin.py index 72c218208..c4fa982c8 100644 --- a/ipatests/test_xmlrpc/test_old_permission_plugin.py +++ b/ipatests/test_xmlrpc/test_old_permission_plugin.py @@ -155,7 +155,6 @@ class test_old_permission(Declarative): permissions=[u'write'], ipapermbindruletype=[u'permission'], ipapermissiontype=[u'V2', u'SYSTEM'], - filter=[u'objectclass=posixaccount'], subtree=u'ldap:///%s' % users_dn, ), ), @@ -231,7 +230,6 @@ class test_old_permission(Declarative): 'permissions': [u'write'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [u'objectclass=posixaccount'], 'subtree': u'ldap:///%s' % users_dn, }, ), @@ -282,7 +280,6 @@ class test_old_permission(Declarative): 'permissions': [u'write'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [u'objectclass=posixaccount'], 'subtree': u'ldap:///%s' % users_dn, }, ], @@ -307,7 +304,6 @@ class test_old_permission(Declarative): 'permissions': [u'write'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [u'objectclass=posixaccount'], 'subtree': u'ldap:///%s' % users_dn, }, ], @@ -344,7 +340,6 @@ class test_old_permission(Declarative): 'permissions': [u'write'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [u'objectclass=posixaccount'], 'subtree': u'ldap:///%s' % users_dn, }, ], @@ -400,7 +395,6 @@ class test_old_permission(Declarative): owner=[u'cn=test', u'cn=test2'], ipapermbindruletype=[u'permission'], ipapermissiontype=[u'V2', u'SYSTEM'], - filter=[u'objectclass=posixaccount'], subtree=u'ldap:///%s' % users_dn, ), ), @@ -424,7 +418,6 @@ class test_old_permission(Declarative): 'permissions': [u'write'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [u'objectclass=posixaccount'], 'subtree': u'ldap:///%s' % users_dn, }, { @@ -435,7 +428,6 @@ class test_old_permission(Declarative): 'permissions': [u'write'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [u'objectclass=posixaccount'], 'subtree': u'ldap:///%s' % users_dn, }, ], @@ -519,7 +511,6 @@ class test_old_permission(Declarative): 'permissions': [u'write'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [u'objectclass=posixaccount'], 'subtree': u'ldap:///%s' % users_dn, }, ], @@ -544,7 +535,6 @@ class test_old_permission(Declarative): 'permissions': [u'write'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [u'objectclass=posixaccount'], 'subtree': u'ldap:///%s' % users_dn, }, { @@ -555,7 +545,6 @@ class test_old_permission(Declarative): 'permissions': [u'write'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [u'objectclass=posixaccount'], 'subtree': u'ldap:///%s' % users_dn, }, ], @@ -618,8 +607,6 @@ class test_old_permission(Declarative): owner=[u'cn=other-test', u'cn=other-test2'], ipapermbindruletype=[u'permission'], ipapermissiontype=[u'V2', u'SYSTEM'], - filter=[u'memberOf=%s' % DN('cn=ipausers', groups_dn), - u'objectclass=posixaccount'], subtree=u'ldap:///%s' % users_dn, ), ), @@ -642,8 +629,6 @@ class test_old_permission(Declarative): 'memberof': u'ipausers', 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [u'memberOf=%s' % DN('cn=ipausers', groups_dn), - u'objectclass=posixaccount'], 'subtree': u'ldap:///%s' % users_dn, }, ), @@ -689,8 +674,6 @@ class test_old_permission(Declarative): 'memberof': u'ipausers', 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [u'memberOf=%s' % DN('cn=ipausers', groups_dn), - u'objectclass=posixaccount'], 'subtree': u'ldap:///%s' % users_dn, }, ), @@ -717,8 +700,6 @@ class test_old_permission(Declarative): 'memberof': u'ipausers', 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [u'memberOf=%s' % DN('cn=ipausers', groups_dn), - u'objectclass=posixaccount'], 'subtree': u'ldap:///%s' % users_dn, }, ), @@ -745,8 +726,6 @@ class test_old_permission(Declarative): 'memberof': u'ipausers', 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [u'memberOf=%s' % DN('cn=ipausers', groups_dn), - u'objectclass=posixaccount'], 'subtree': u'ldap:///%s' % users_dn, }, ), @@ -773,7 +752,6 @@ class test_old_permission(Declarative): memberof=u'ipausers', ipapermbindruletype=[u'permission'], ipapermissiontype=[u'V2', u'SYSTEM'], - filter=[u'memberOf=%s' % DN('cn=ipausers', groups_dn)], ), ), ), @@ -798,9 +776,6 @@ class test_old_permission(Declarative): 'memberof':u'ipausers', 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'V2', u'SYSTEM'], - 'filter': [ - u'memberOf=%s' % DN('cn=ipausers', groups_dn)], - }, ], ), @@ -946,8 +921,6 @@ class test_old_permission(Declarative): type=u'user', ipapermbindruletype=[u'permission'], ipapermissiontype=[u'V2', u'SYSTEM'], - filter=[u'memberOf=%s' % DN('cn=editors', groups_dn), - u'objectclass=posixaccount'], subtree=u'ldap:///%s' % users_dn, ), ), @@ -979,8 +952,6 @@ class test_old_permission(Declarative): type=u'user', ipapermbindruletype=[u'permission'], ipapermissiontype=[u'V2', u'SYSTEM'], - filter=[u'memberOf=%s' % DN('cn=admins', groups_dn), - u'objectclass=posixaccount'], subtree=u'ldap:///%s' % users_dn, ), ), @@ -1004,7 +975,6 @@ class test_old_permission(Declarative): type=u'user', ipapermbindruletype=[u'permission'], ipapermissiontype=[u'V2', u'SYSTEM'], - filter=[u'objectclass=posixaccount'], subtree=u'ldap:///%s' % users_dn, ), ), @@ -1078,7 +1048,6 @@ class test_old_permission(Declarative): attrs=(u'cn',), ipapermbindruletype=[u'permission'], ipapermissiontype=[u'V2', u'SYSTEM'], - filter=[u'objectclass=posixaccount'], subtree=u'ldap:///%s' % users_dn, ), ), @@ -1101,7 +1070,7 @@ class test_old_permission(Declarative): attributelevelrights=permission3_attributelevelrights, ipapermbindruletype=[u'permission'], ipapermissiontype=[u'V2', u'SYSTEM'], - filter=[u'objectclass=posixaccount'], + ipapermtargetfilter=[u'(objectclass=posixaccount)'], subtree=u'ldap:///%s' % users_dn, ), ), @@ -1124,7 +1093,7 @@ class test_old_permission(Declarative): attributelevelrights=permission3_attributelevelrights, ipapermbindruletype=[u'permission'], ipapermissiontype=[u'V2', u'SYSTEM'], - filter=[u'objectclass=posixaccount'], + ipapermtargetfilter=[u'(objectclass=posixaccount)'], subtree=u'ldap:///%s' % users_dn, ), ), |