diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py index 517b8205e..012946658 100644 --- a/ipatests/test_xmlrpc/test_permission_plugin.py +++ b/ipatests/test_xmlrpc/test_permission_plugin.py @@ -533,8 +533,7 @@ class test_permission(Declarative): '(targetfilter = "(objectclass=posixaccount)")' + '(version 3.0;acl "permission:%(name)s";' 'allow (write) groupdn = "ldap:///%(pdn)s";)' % - {'tdn': DN(('uid', '*'), users_dn), - 'name': permission1, + {'name': permission1, 'pdn': permission1_dn}], }, ), @@ -651,8 +650,7 @@ class test_permission(Declarative): '(targetfilter = "(objectclass=posixaccount)")' + '(version 3.0;acl "permission:%(name)s";' 'allow (write) groupdn = "ldap:///%(pdn)s";)' % - {'tdn': DN(('uid', '*'), users_dn), - 'name': permission1, + {'name': permission1, 'pdn': permission1_dn}], }, ], diff --git a/make-lint b/make-lint index a2f28ae75..7de768b65 100755 --- a/make-lint +++ b/make-lint @@ -279,7 +279,6 @@ def main(): linter.set_option('disable', 'unnecessary-pass') linter.set_option('disable', 'unnecessary-semicolon') linter.set_option('disable', 'unused-argument') - linter.set_option('disable', 'unused-format-string-key') linter.set_option('disable', 'unused-variable') linter.set_option('disable', 'useless-else-on-loop') linter.set_option('disable', 'unbalanced-tuple-unpacking')