diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-09-21 10:34:15 +0200 |
|---|---|---|
| committer | Tomas Babej <tbabej@redhat.com> | 2015-10-13 14:16:32 +0200 |
| commit | 905d81f500d40b44c8e7f284af11300057e3d1b7 (patch) | |
| tree | b5853a08125740b65b01000883ec42274ab12074 /ipatests/test_xmlrpc | |
| parent | be876987f527cd9d574f02385ed95e1bd0d5b91b (diff) | |
| download | freeipa-905d81f500d40b44c8e7f284af11300057e3d1b7.tar.gz freeipa-905d81f500d40b44c8e7f284af11300057e3d1b7.tar.xz freeipa-905d81f500d40b44c8e7f284af11300057e3d1b7.zip | |
ipalib.aci: Port to Python 3
- Don't encode under Python 3, where shlex would choke on bytes
- Sort the attrs dictionary in export_to_string, so the tests are
deterministic. (The iteration order of dicts was always unspecified,
but was always the same in practice under CPython 2.)
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipatests/test_xmlrpc')
| -rw-r--r-- | ipatests/test_xmlrpc/test_permission_plugin.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py index 88401190a..b9c8d1b98 100644 --- a/ipatests/test_xmlrpc/test_permission_plugin.py +++ b/ipatests/test_xmlrpc/test_permission_plugin.py @@ -1453,8 +1453,8 @@ class test_permission(Declarative): verify_permission_aci( permission1, api.env.basedn, - '(targetattr = "sn")' + '(target = "ldap:///%s")' % DN('cn=editors', groups_dn) + + '(targetattr = "sn")' + '(version 3.0;acl "permission:%s";' % permission1 + 'allow (write) groupdn = "ldap:///%s";)' % permission1_dn, ), @@ -1623,8 +1623,8 @@ class test_permission_rollback(Declarative): verify_permission_aci( permission1, users_dn, - '(targetattr = "sn")' + '(target = "ldap:///%s")' % DN(('uid', 'admin'), users_dn) + + '(targetattr = "sn")' + '(version 3.0;acl "permission:%s";' % permission1 + 'allow (write) groupdn = "ldap:///%s";)' % permission1_dn, ), @@ -1964,8 +1964,8 @@ class test_permission_sync_attributes(Declarative): verify_permission_aci( permission1, groups_dn, - '(targetattr = "sn")' + '(target = "ldap:///%s")' % DN(('cn', 'editors'), groups_dn) + + '(targetattr = "sn")' + '(targetfilter = "%s")' % group_filter + '(version 3.0;acl "permission:%s";' % permission1 + 'allow (write) groupdn = "ldap:///%s";)' % permission1_dn, @@ -2000,8 +2000,8 @@ class test_permission_sync_attributes(Declarative): verify_permission_aci( permission1, groups_dn, - '(targetattr = "sn")' + '(target = "ldap:///%s")' % DN(('cn', 'editors'), groups_dn) + + '(targetattr = "sn")' + '(targetfilter = "(&(cn=blabla)%s)")' % group_filter + '(version 3.0;acl "permission:%s";' % permission1 + 'allow (write) groupdn = "ldap:///%s";)' % permission1_dn, @@ -2235,8 +2235,8 @@ class test_permission_sync_nice(Declarative): verify_permission_aci( permission1, groups_dn, - '(targetattr = "sn")' + '(target = "ldap:///%s")' % DN(('cn', 'editors'), groups_dn) + + '(targetattr = "sn")' + '(targetfilter = "%s")' % group_filter + '(version 3.0;acl "permission:%s";' % permission1 + 'allow (write) groupdn = "ldap:///%s";)' % permission1_dn, |