diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2011-01-07 11:17:55 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2011-01-10 10:32:10 -0500 |
| commit | 6f58f38748085e6a104de6f9e992469d3b685d5a (patch) | |
| tree | ebc3a92f95feae19afc8ababcf306782e62988f8 /tests/test_xmlrpc/test_automount_plugin.py | |
| parent | 0a79836082b897ebf734d9073583769cb276937c (diff) | |
| download | freeipa-6f58f38748085e6a104de6f9e992469d3b685d5a.tar.gz freeipa-6f58f38748085e6a104de6f9e992469d3b685d5a.tar.xz freeipa-6f58f38748085e6a104de6f9e992469d3b685d5a.zip | |
Display the entries that failed when deleting with --continue.
We collected the failures but didn't report it back. This changes the
API of most delete commands so rather than returning a boolean it returns
a dict with the only current key as failed.
This also adds a new parameter flag, suppress_empty. This will try to
not print values that are empty if included. This makes the output of
the delete commands a bit prettier.
ticket 687
Diffstat (limited to 'tests/test_xmlrpc/test_automount_plugin.py')
| -rw-r--r-- | tests/test_xmlrpc/test_automount_plugin.py | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/tests/test_xmlrpc/test_automount_plugin.py b/tests/test_xmlrpc/test_automount_plugin.py index e793a454a..92c695d42 100644 --- a/tests/test_xmlrpc/test_automount_plugin.py +++ b/tests/test_xmlrpc/test_automount_plugin.py @@ -147,7 +147,8 @@ class test_automount(XMLRPC_test): """ delkey_kw={'automountkey': self.keyname, 'raw': True} res = api.Command['automountkey_del'](self.locname, self.mapname, **delkey_kw)['result'] - assert res == True + assert res + assert_attr_equal(res, 'failed', '') # Verify that it is gone try: @@ -162,7 +163,8 @@ class test_automount(XMLRPC_test): Test the `xmlrpc.automountlocation_del` method. """ res = api.Command['automountlocation_del'](self.locname)['result'] - assert res == True + assert res + assert_attr_equal(res, 'failed', '') # Verify that it is gone try: @@ -227,7 +229,8 @@ class test_automount_indirect(XMLRPC_test): """ delkey_kw = {'automountkey': self.keyname} res = api.Command['automountkey_del'](self.locname, self.parentmap, **delkey_kw)['result'] - assert res == True + assert res + assert_attr_equal(res, 'failed', '') # Verify that it is gone try: @@ -242,7 +245,8 @@ class test_automount_indirect(XMLRPC_test): Remove the indirect map for auto.home. """ res = api.Command['automountmap_del'](self.locname, self.mapname)['result'] - assert res == True + assert res + assert_attr_equal(res, 'failed', '') # Verify that it is gone try: @@ -257,7 +261,8 @@ class test_automount_indirect(XMLRPC_test): Remove the location. """ res = api.Command['automountlocation_del'](self.locname)['result'] - assert res == True + assert res + assert_attr_equal(res, 'failed', '') # Verity that it is gone try: @@ -310,7 +315,8 @@ class test_automount_indirect_no_parent(XMLRPC_test): """ delkey_kw={'automountkey': self.keyname} res = api.Command['automountkey_del'](self.locname, self.parentmap, **delkey_kw)['result'] - assert res == True + assert res + assert_attr_equal(res, 'failed', '') # Verify that it is gone try: @@ -325,7 +331,8 @@ class test_automount_indirect_no_parent(XMLRPC_test): Remove the indirect map for auto.home. """ res = api.Command['automountmap_del'](self.locname, self.mapname)['result'] - assert res == True + assert res + assert_attr_equal(res, 'failed', '') # Verify that it is gone try: @@ -340,7 +347,8 @@ class test_automount_indirect_no_parent(XMLRPC_test): Remove the location. """ res = api.Command['automountlocation_del'](self.locname)['result'] - assert res == True + assert res + assert_attr_equal(res, 'failed', '') # Verity that it is gone try: |