From dbf10b83bd61fd7e654beb47bc05c070c6dcdd4e Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Tue, 22 Oct 2013 12:15:52 +0200 Subject: Improve permission plugin test cleanup The rename tests use names that were not being cleaned up when the tests fail. Add cleanup steps for them. Also, use --force so system permissions are removed as well. --- ipatests/test_xmlrpc/test_permission_plugin.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ipatests') diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py index 1be1fed3..a3913a85 100644 --- a/ipatests/test_xmlrpc/test_permission_plugin.py +++ b/ipatests/test_xmlrpc/test_permission_plugin.py @@ -81,9 +81,11 @@ invalid_permission1 = u'bad;perm' class test_permission(Declarative): cleanup_commands = [ - ('permission_del', [permission1], {}), - ('permission_del', [permission2], {}), - ('permission_del', [permission3], {}), + ('permission_del', [permission1], {'force': True}), + ('permission_del', [permission2], {'force': True}), + ('permission_del', [permission3], {'force': True}), + ('permission_del', [permission1_renamed], {'force': True}), + ('permission_del', [permission1_renamed_ucase], {'force': True}), ('privilege_del', [privilege1], {}), ] -- cgit