summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-10-22 12:15:52 +0200
committerMartin Kosek <mkosek@redhat.com>2013-10-30 11:50:05 +0100
commitdbf10b83bd61fd7e654beb47bc05c070c6dcdd4e (patch)
tree0c8767a970c2059d609fa0123ec1cf2607053a56
parent2c433cdd7ed527ba24c64d4d7cead6eee7ede867 (diff)
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.
-rw-r--r--ipatests/test_xmlrpc/test_permission_plugin.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py
index 1be1fed3e..a3913a858 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], {}),
]