diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2014-03-27 14:04:00 +0100 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-04-18 14:59:20 +0200 |
| commit | 4314d02fbf9ef1cb9543ecf76a8d22e79d250214 (patch) | |
| tree | 8c6ac601e881712e8cf7c25fce420026a3762553 /ipatests/test_xmlrpc/test_automount_plugin.py | |
| parent | c644b47492e22370bc71f57e5ac46b50f9b4e247 (diff) | |
| download | freeipa-4314d02fbf9ef1cb9543ecf76a8d22e79d250214.tar.gz freeipa-4314d02fbf9ef1cb9543ecf76a8d22e79d250214.tar.xz freeipa-4314d02fbf9ef1cb9543ecf76a8d22e79d250214.zip | |
Allow primary keys to use different type than unicode.
Also return list of primary keys instead of a single unicode CSV value from
LDAPDelete-based commands.
This introduces a new capability 'primary_key_types' for backward
compatibility with old clients.
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipatests/test_xmlrpc/test_automount_plugin.py')
| -rw-r--r-- | ipatests/test_xmlrpc/test_automount_plugin.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ipatests/test_xmlrpc/test_automount_plugin.py b/ipatests/test_xmlrpc/test_automount_plugin.py index e1af651c8..2eee80b1f 100644 --- a/ipatests/test_xmlrpc/test_automount_plugin.py +++ b/ipatests/test_xmlrpc/test_automount_plugin.py @@ -100,7 +100,7 @@ class AutomountTest(XMLRPC_test): finally: res = api.Command['automountlocation_del'](self.locname)['result'] assert res - assert_attr_equal(res, 'failed', '') + assert not res['failed'] # Success; delete the temporary directory shutil.rmtree(conf_directory) @@ -285,7 +285,7 @@ class test_automount(AutomountTest): delkey_kw={'automountkey': self.keyname_rename, 'automountinformation' : self.newinfo} res = api.Command['automountkey_del'](self.locname, self.mapname, **delkey_kw)['result'] assert res - assert_attr_equal(res, 'failed', '') + assert not res['failed'] # Verify that it is gone with assert_raises(errors.NotFound): @@ -297,7 +297,7 @@ class test_automount(AutomountTest): """ res = api.Command['automountlocation_del'](self.locname)['result'] assert res - assert_attr_equal(res, 'failed', '') + assert not res['failed'] # Verify that it is gone with assert_raises(errors.NotFound): @@ -367,7 +367,7 @@ class test_automount_direct(AutomountTest): """ res = api.Command['automountlocation_del'](self.locname)['result'] assert res - assert_attr_equal(res, 'failed', '') + assert not res['failed'] # Verity that it is gone with assert_raises(errors.NotFound): @@ -443,7 +443,7 @@ class test_automount_indirect(AutomountTest): """ res = api.Command['automountkey_del'](self.locname, self.parentmap, **self.key_kw)['result'] assert res - assert_attr_equal(res, 'failed', '') + assert not res['failed'] # Verify that it is gone with assert_raises(errors.NotFound): @@ -455,7 +455,7 @@ class test_automount_indirect(AutomountTest): """ res = api.Command['automountmap_del'](self.locname, self.mapname)['result'] assert res - assert_attr_equal(res, 'failed', '') + assert not res['failed'] # Verify that it is gone with assert_raises(errors.NotFound): @@ -467,7 +467,7 @@ class test_automount_indirect(AutomountTest): """ res = api.Command['automountlocation_del'](self.locname)['result'] assert res - assert_attr_equal(res, 'failed', '') + assert not res['failed'] # Verity that it is gone with assert_raises(errors.NotFound): @@ -551,7 +551,7 @@ class test_automount_indirect_no_parent(AutomountTest): delkey_kw={'automountkey': self.keyname, 'automountinformation': self.mapname} res = api.Command['automountkey_del'](self.locname, self.parentmap, **delkey_kw)['result'] assert res - assert_attr_equal(res, 'failed', '') + assert not res['failed'] # Verify that it is gone with assert_raises(errors.NotFound): @@ -563,7 +563,7 @@ class test_automount_indirect_no_parent(AutomountTest): """ res = api.Command['automountmap_del'](self.locname, self.mapname)['result'] assert res - assert_attr_equal(res, 'failed', '') + assert not res['failed'] # Verify that it is gone with assert_raises(errors.NotFound): @@ -575,7 +575,7 @@ class test_automount_indirect_no_parent(AutomountTest): """ res = api.Command['automountlocation_del'](self.locname)['result'] assert res - assert_attr_equal(res, 'failed', '') + assert not res['failed'] # Verity that it is gone with assert_raises(errors.NotFound): |