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 | |
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')
24 files changed, 188 insertions, 183 deletions
diff --git a/ipatests/test_ipalib/test_output.py b/ipatests/test_ipalib/test_output.py index 15ef11e10..e722a973d 100644 --- a/ipatests/test_ipalib/test_output.py +++ b/ipatests/test_ipalib/test_output.py @@ -25,6 +25,7 @@ from ipatests.util import raises, ClassChecker from ipalib import output from ipalib.frontend import Command from ipalib import _ +from ipapython.version import API_VERSION class test_Output(ClassChecker): """ @@ -78,12 +79,14 @@ class test_ListOfEntries(ClassChecker): okay = dict(foo='bar') nope = ('aye', 'bee') - e = raises(TypeError, inst.validate, cmd, [okay, okay, nope]) + e = raises(TypeError, inst.validate, + cmd, [okay, okay, nope], API_VERSION) assert str(e) == output.emsg % ( 'example', 'ListOfEntries', 'stuff', 2, dict, tuple, nope ) - e = raises(TypeError, inst.validate, cmd, [nope, okay, nope]) + e = raises(TypeError, inst.validate, + cmd, [nope, okay, nope], API_VERSION) assert str(e) == output.emsg % ( 'example', 'ListOfEntries', 'stuff', 0, dict, tuple, nope ) diff --git a/ipatests/test_xmlrpc/test_automember_plugin.py b/ipatests/test_xmlrpc/test_automember_plugin.py index 600d54890..6618ac605 100644 --- a/ipatests/test_xmlrpc/test_automember_plugin.py +++ b/ipatests/test_xmlrpc/test_automember_plugin.py @@ -242,7 +242,7 @@ class test_automember(Declarative): desc='Rebuild membership for hostgroups', command=('automember_rebuild', [], dict(type=u'hostgroup')), expected=dict( - value=u'', + value=None, summary=fuzzy_automember_message, result=dict() ), @@ -252,7 +252,7 @@ class test_automember(Declarative): desc='Rebuild membership for hostgroups asynchronously', command=('automember_rebuild', [], dict(type=u'hostgroup',no_wait=True)), expected=dict( - value=u'', + value=None, summary=u'Automember rebuild membership task started', result=dict( dn=fuzzy_automember_dn @@ -361,7 +361,7 @@ class test_automember(Declarative): desc='Rebuild membership for host: %s' % fqdn1, command=('automember_rebuild', [], dict(hosts=fqdn1)), expected=dict( - value=u'', + value=None, summary=fuzzy_automember_message, result=dict() ), @@ -371,7 +371,7 @@ class test_automember(Declarative): desc='Rebuild membership for host: %s asynchronously' % fqdn1, command=('automember_rebuild', [], dict(hosts=fqdn1, no_wait=True)), expected=dict( - value=u'', + value=None, summary=u'Automember rebuild membership task started', result=dict( dn=fuzzy_automember_dn @@ -398,9 +398,9 @@ class test_automember(Declarative): desc='Delete host: %r' % fqdn1, command=('host_del', [fqdn1], dict()), expected=dict( - value=fqdn1, + value=[fqdn1], summary=u'Deleted host "%s"' % fqdn1, - result=dict(failed=u''), + result=dict(failed=[]), ), ), @@ -408,9 +408,9 @@ class test_automember(Declarative): desc='Delete hostgroup: %r' % hostgroup1, command=('hostgroup_del', [hostgroup1], dict()), expected=dict( - value=hostgroup1, + value=[hostgroup1], summary=u'Deleted hostgroup "%s"' % hostgroup1, - result=dict(failed=u''), + result=dict(failed=[]), ), ), @@ -418,9 +418,9 @@ class test_automember(Declarative): desc='Delete automember rule: %r' % hostgroup1, command=('automember_del', [hostgroup1], dict(type=u'hostgroup')), expected=dict( - value=hostgroup1, + value=[hostgroup1], summary=u'Deleted automember rule "%s"' % hostgroup1, - result=dict(failed=u''), + result=dict(failed=[]), ), ), @@ -543,7 +543,7 @@ class test_automember(Declarative): desc='Rebuild membership for groups', command=('automember_rebuild', [], dict(type=u'group')), expected=dict( - value=u'', + value=None, summary=fuzzy_automember_message, result=dict() ), @@ -553,7 +553,7 @@ class test_automember(Declarative): desc='Rebuild membership for groups asynchronously', command=('automember_rebuild', [], dict(type=u'group', no_wait=True)), expected=dict( - value=u'', + value=None, summary=u'Automember rebuild membership task started', result=dict( dn=fuzzy_automember_dn @@ -620,7 +620,7 @@ class test_automember(Declarative): desc='Rebuild membership for user: %s' % user1, command=('automember_rebuild', [], dict(users=user1)), expected=dict( - value=u'', + value=None, summary=fuzzy_automember_message, result=dict() ), @@ -630,7 +630,7 @@ class test_automember(Declarative): desc='Rebuild membership for user: %s asynchronously' % user1, command=('automember_rebuild', [], dict(users=user1, no_wait=True)), expected=dict( - value=u'', + value=None, summary=u'Automember rebuild membership task started', result=dict( dn=fuzzy_automember_dn @@ -658,9 +658,9 @@ class test_automember(Declarative): desc='Delete user: %r' % user1, command=('user_del', [user1], dict()), expected=dict( - value=user1, + value=[user1], summary=u'Deleted user "%s"' % user1, - result=dict(failed=u''), + result=dict(failed=[]), ), ), @@ -668,9 +668,9 @@ class test_automember(Declarative): desc='Delete user: %r' % manager1, command=('user_del', [manager1], dict()), expected=dict( - value=manager1, + value=[manager1], summary=u'Deleted user "%s"' % manager1, - result=dict(failed=u''), + result=dict(failed=[]), ), ), @@ -678,9 +678,9 @@ class test_automember(Declarative): desc='Delete group: %r' % group1, command=('group_del', [group1], dict()), expected=dict( - value=group1, + value=[group1], summary=u'Deleted group "%s"' % group1, - result=dict(failed=u''), + result=dict(failed=[]), ), ), @@ -688,9 +688,9 @@ class test_automember(Declarative): desc='Delete automember rule: %r' % group1, command=('automember_del', [group1], dict(type=u'group')), expected=dict( - value=group1, + value=[group1], summary=u'Deleted automember rule "%s"' % group1, - result=dict(failed=u''), + result=dict(failed=[]), ), ), 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): diff --git a/ipatests/test_xmlrpc/test_batch_plugin.py b/ipatests/test_xmlrpc/test_batch_plugin.py index 2b056c93f..7f5a09fc7 100644 --- a/ipatests/test_xmlrpc/test_batch_plugin.py +++ b/ipatests/test_xmlrpc/test_batch_plugin.py @@ -104,8 +104,8 @@ class test_batch(Declarative): error=None), dict( summary=u'Deleted group "%s"' % group1, - result=dict(failed=u''), - value=group1, + result=dict(failed=[]), + value=[group1], error=None), ), ), diff --git a/ipatests/test_xmlrpc/test_config_plugin.py b/ipatests/test_xmlrpc/test_config_plugin.py index 56baf7f0b..6880d6139 100644 --- a/ipatests/test_xmlrpc/test_config_plugin.py +++ b/ipatests/test_xmlrpc/test_config_plugin.py @@ -37,7 +37,7 @@ class test_config(Declarative): dict(addattr=u'ipauserobjectclasses=ipahost')), expected=dict( result=lambda d: 'ipahost' in d['ipauserobjectclasses'], - value=u'', + value=None, summary=None, ), ), @@ -48,7 +48,7 @@ class test_config(Declarative): dict(delattr=u'ipauserobjectclasses=ipahost')), expected=dict( result=lambda d: 'ipahost' not in d['ipauserobjectclasses'], - value=u'', + value=None, summary=None, ), ), @@ -123,7 +123,7 @@ class test_config(Declarative): command=('config_mod', [], dict(ipauserauthtype=u'password')), expected=dict( result=lambda d: d['ipauserauthtype'] == (u'password',), - value=u'', + value=None, summary=None, ), ), @@ -133,7 +133,7 @@ class test_config(Declarative): command=('config_show', [], {}), expected=dict( result=lambda d: d['ipauserauthtype'] == (u'password',), - value=u'', + value=None, summary=None, ), ), @@ -143,7 +143,7 @@ class test_config(Declarative): command=('config_mod', [], dict(ipauserauthtype=None)), expected=dict( result=lambda d: 'ipauserauthtype' not in d, - value=u'', + value=None, summary=None, ), ), diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py index dd434c2f5..7fbf37313 100644 --- a/ipatests/test_xmlrpc/test_dns_plugin.py +++ b/ipatests/test_xmlrpc/test_dns_plugin.py @@ -451,9 +451,9 @@ class test_dns(Declarative): desc='Delete reverse zone %r' % revzone1, command=('dnszone_del', [revzone1], {}), expected={ - 'value': revzone1, + 'value': [revzone1], 'summary': u'Deleted DNS zone "%s"' % revzone1, - 'result': {'failed': u''}, + 'result': {'failed': []}, }, ), @@ -560,7 +560,7 @@ class test_dns(Declarative): desc='Remove A record from %r in zone %r' % (name1, zone1), command=('dnsrecord_del', [zone1, name1], {'arecord': arec2}), expected={ - 'value': name1, + 'value': [name1], 'summary': None, 'result': { 'idnsname': [name1], @@ -897,9 +897,9 @@ class test_dns(Declarative): desc='Delete zone %r' % zone2, command=('dnszone_del', [zone2], {}), expected={ - 'value': zone2, + 'value': [zone2], 'summary': u'Deleted DNS zone "%s"' % zone2, - 'result': {'failed': u''}, + 'result': {'failed': []}, }, ), @@ -1026,9 +1026,9 @@ class test_dns(Declarative): desc='Delete record %r in zone %r' % (name1_renamed, zone1), command=('dnsrecord_del', [zone1, name1_renamed], {'del_all': True }), expected={ - 'value': name1_renamed, + 'value': [name1_renamed], 'summary': u'Deleted record "%s"' % name1_renamed, - 'result': {'failed': u''}, + 'result': {'failed': []}, }, ), @@ -1166,7 +1166,7 @@ class test_dns(Declarative): desc='Update global DNS settings', command=('dnsconfig_mod', [], {'idnsforwarders' : [fwd_ip],}), expected={ - 'value': u'', + 'value': None, 'summary': None, 'result': { 'idnsforwarders': [fwd_ip], @@ -1406,9 +1406,9 @@ class test_dns(Declarative): desc='Delete zone %r' % zone1, command=('dnszone_del', [zone1], {}), expected={ - 'value': zone1, + 'value': [zone1], 'summary': u'Deleted DNS zone "%s"' % zone1, - 'result': {'failed': u''}, + 'result': {'failed': []}, }, ), @@ -1469,9 +1469,9 @@ class test_dns(Declarative): desc='Delete zone %r' % zone1, command=('dnszone_del', [zone1], {}), expected={ - 'value': zone1, + 'value': [zone1], 'summary': u'Deleted DNS zone "%s"' % zone1, - 'result': {'failed': u''}, + 'result': {'failed': []}, }, ), diff --git a/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py index 1e46d362e..ccb3e77c9 100644 --- a/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py +++ b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py @@ -55,6 +55,8 @@ def assert_realmdomain_and_txt_record_present(response): def assert_realmdomain_and_txt_record_not_present(response): zone = response['value'] + if isinstance(zone, (tuple, list)): + zone = zone[0] r = api.Command['realmdomains_show']() assert zone not in r['result']['associateddomain'] @@ -159,9 +161,9 @@ class test_dns_realmdomains_integration(Declarative): 'during dnszone_del', command=('dnszone_del', [dnszone_1], {}), expected={ - 'value': dnszone_1, + 'value': [dnszone_1], 'summary': u'Deleted DNS zone "%s"' % dnszone_1, - 'result': {'failed': u''}, + 'result': {'failed': []}, }, extra_check=assert_realmdomain_and_txt_record_not_present, ), diff --git a/ipatests/test_xmlrpc/test_group_plugin.py b/ipatests/test_xmlrpc/test_group_plugin.py index 568e5851e..71172893b 100644 --- a/ipatests/test_xmlrpc/test_group_plugin.py +++ b/ipatests/test_xmlrpc/test_group_plugin.py @@ -554,8 +554,8 @@ class test_group(Declarative): desc='Remove group %r with external membership' % (group3), command=('group_del', [group3], {}), expected=dict( - result=dict(failed=u''), - value=group3, + result=dict(failed=[]), + value=[group3], summary=u'Deleted group "testgroup3"', ), ), @@ -693,8 +693,8 @@ class test_group(Declarative): desc='Delete %r' % group1, command=('group_del', [group1], {}), expected=dict( - result=dict(failed=u''), - value=group1, + result=dict(failed=[]), + value=[group1], summary=u'Deleted group "testgroup1"', ) ), @@ -728,8 +728,8 @@ class test_group(Declarative): desc='Delete %r' % group2, command=('group_del', [group2], {}), expected=dict( - result=dict(failed=u''), - value=group2, + result=dict(failed=[]), + value=[group2], summary=u'Deleted group "testgroup2"', ) ), @@ -859,8 +859,8 @@ class test_group(Declarative): desc='Now delete the unmanaged group %r' % user1, command=('group_del', [user1], {}), expected=dict( - result=dict(failed=u''), - value=user1, + result=dict(failed=[]), + value=[user1], summary=u'Deleted group "%s"' % user1, ) ), @@ -875,9 +875,9 @@ class test_group(Declarative): desc='Delete %r' % user1, command=('user_del', [user1], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "tuser1"', - value=user1, + value=[user1], ), ), @@ -1004,9 +1004,9 @@ class test_group(Declarative): desc='Delete %r' % user1, command=('user_del', [user1], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % user1, - value=user1, + value=[user1], ), ), diff --git a/ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py b/ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py index 8140741d9..3aaaa36fb 100644 --- a/ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py +++ b/ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py @@ -236,9 +236,9 @@ class test_hbacsvcgroup(Declarative): desc='Delete %r' % hbacsvcgroup1, command=('hbacsvcgroup_del', [hbacsvcgroup1], {}), expected=dict( - value=hbacsvcgroup1, + value=[hbacsvcgroup1], summary=u'Deleted HBAC service group "testhbacsvcgroup1"', - result=dict(failed=u''), + result=dict(failed=[]), ), ), @@ -247,9 +247,9 @@ class test_hbacsvcgroup(Declarative): desc='Delete service %r' % hbacsvc1, command=('hbacsvc_del', [hbacsvc1], {}), expected=dict( - value=hbacsvc1, + value=[hbacsvc1], summary=u'Deleted HBAC service "%s"' % hbacsvc1, - result=dict(failed=u''), + result=dict(failed=[]), ), ) diff --git a/ipatests/test_xmlrpc/test_host_plugin.py b/ipatests/test_xmlrpc/test_host_plugin.py index af42ee54d..6a9e9f17c 100644 --- a/ipatests/test_xmlrpc/test_host_plugin.py +++ b/ipatests/test_xmlrpc/test_host_plugin.py @@ -585,9 +585,9 @@ class test_host(Declarative): desc='Delete %r' % fqdn1, command=('host_del', [fqdn1], {}), expected=dict( - value=fqdn1, + value=[fqdn1], summary=u'Deleted host "%s"' % fqdn1, - result=dict(failed=u''), + result=dict(failed=[]), ), ), @@ -661,9 +661,9 @@ class test_host(Declarative): desc='Delete using host name %r' % short1, command=('host_del', [short1], {}), expected=dict( - value=short1, + value=[short1], summary=u'Deleted host "%s"' % short1, - result=dict(failed=u''), + result=dict(failed=[]), ), ), @@ -831,9 +831,9 @@ class test_host(Declarative): desc='Delete %r' % fqdn3, command=('host_del', [fqdn3], {}), expected=dict( - value=fqdn3, + value=[fqdn3], summary=u'Deleted host "%s"' % fqdn3, - result=dict(failed=u''), + result=dict(failed=[]), ), ), diff --git a/ipatests/test_xmlrpc/test_hostgroup_plugin.py b/ipatests/test_xmlrpc/test_hostgroup_plugin.py index b610979ec..017d8ad2d 100644 --- a/ipatests/test_xmlrpc/test_hostgroup_plugin.py +++ b/ipatests/test_xmlrpc/test_hostgroup_plugin.py @@ -261,9 +261,9 @@ class test_hostgroup(Declarative): desc='Delete %r' % hostgroup1, command=('hostgroup_del', [hostgroup1], {}), expected=dict( - value=hostgroup1, + value=[hostgroup1], summary=u'Deleted hostgroup "testhostgroup1"', - result=dict(failed=u''), + result=dict(failed=[]), ), ), @@ -293,9 +293,9 @@ class test_hostgroup(Declarative): desc='Delete %r' % hostgroup_single, command=('hostgroup_del', [hostgroup_single], {}), expected=dict( - value=hostgroup_single, + value=[hostgroup_single], summary=u'Deleted hostgroup "a"', - result=dict(failed=u''), + result=dict(failed=[]), ), ), @@ -304,9 +304,9 @@ class test_hostgroup(Declarative): desc='Delete host %r' % fqdn1, command=('host_del', [fqdn1], {}), expected=dict( - value=fqdn1, + value=[fqdn1], summary=u'Deleted host "%s"' % fqdn1, - result=dict(failed=u''), + result=dict(failed=[]), ), ) diff --git a/ipatests/test_xmlrpc/test_krbtpolicy.py b/ipatests/test_xmlrpc/test_krbtpolicy.py index 6d7d1b6ef..33034f4ed 100644 --- a/ipatests/test_xmlrpc/test_krbtpolicy.py +++ b/ipatests/test_xmlrpc/test_krbtpolicy.py @@ -42,7 +42,7 @@ class test_krbtpolicy(Declarative): 'krbtpolicy_reset', [], {} ), expected=dict( - value=u'', + value=None, summary=None, result=dict( krbmaxticketlife=[u'86400'], @@ -58,7 +58,7 @@ class test_krbtpolicy(Declarative): 'krbtpolicy_show', [], {} ), expected=dict( - value=u'', + value=None, summary=None, result=dict( dn=DN(('cn',api.env.domain),('cn','kerberos'), @@ -76,7 +76,7 @@ class test_krbtpolicy(Declarative): 'krbtpolicy_mod', [], dict(krbmaxticketlife=3600) ), expected=dict( - value=u'', + value=None, summary=None, result=dict( krbmaxticketlife=[u'3600'], diff --git a/ipatests/test_xmlrpc/test_netgroup_plugin.py b/ipatests/test_xmlrpc/test_netgroup_plugin.py index dd3a8b84c..162879884 100644 --- a/ipatests/test_xmlrpc/test_netgroup_plugin.py +++ b/ipatests/test_xmlrpc/test_netgroup_plugin.py @@ -200,9 +200,9 @@ class test_netgroup(Declarative): desc='Delete %r' % netgroup_single, command=('netgroup_del', [netgroup_single], {}), expected=dict( - value=netgroup_single, + value=[netgroup_single], summary=u'Deleted netgroup "%s"' % netgroup_single, - result=dict(failed=u''), + result=dict(failed=[]), ), ), @@ -1281,9 +1281,9 @@ class test_netgroup(Declarative): desc='Delete %r' % netgroup1, command=('netgroup_del', [netgroup1], {}), expected=dict( - value=netgroup1, + value=[netgroup1], summary=u'Deleted netgroup "%s"' % netgroup1, - result=dict(failed=u''), + result=dict(failed=[]), ), ), diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py index 54e8d57dd..24585beae 100644 --- a/ipatests/test_xmlrpc/test_permission_plugin.py +++ b/ipatests/test_xmlrpc/test_permission_plugin.py @@ -1217,8 +1217,8 @@ class test_permission(Declarative): desc='Delete %r' % permission1_renamed_ucase, command=('permission_del', [permission1_renamed_ucase], {}), expected=dict( - result=dict(failed=u''), - value=permission1_renamed_ucase, + result=dict(failed=[]), + value=[permission1_renamed_ucase], summary=u'Deleted permission "%s"' % permission1_renamed_ucase, ) ), @@ -1253,8 +1253,8 @@ class test_permission(Declarative): desc='Delete %r' % permission2, command=('permission_del', [permission2], {}), expected=dict( - result=dict(failed=u''), - value=permission2, + result=dict(failed=[]), + value=[permission2], summary=u'Deleted permission "%s"' % permission2, ) ), @@ -1277,8 +1277,8 @@ class test_permission(Declarative): desc='Delete %r' % privilege1, command=('privilege_del', [privilege1], {}), expected=dict( - result=dict(failed=u''), - value=privilege1, + result=dict(failed=[]), + value=[privilege1], summary=u'Deleted privilege "%s"' % privilege1, ) ), @@ -1410,8 +1410,8 @@ class test_permission(Declarative): desc='Delete %r' % permission1, command=('permission_del', [permission1], {}), expected=dict( - result=dict(failed=u''), - value=permission1, + result=dict(failed=[]), + value=[permission1], summary=u'Deleted permission "%s"' % permission1, ) ), @@ -2697,8 +2697,8 @@ def _make_permission_flag_tests(flags, expected_message): desc='Delete %r with --force' % permission1, command=('permission_del', [permission1], {'force': True}), expected=dict( - result=dict(failed=u''), - value=permission1, + result=dict(failed=[]), + value=[permission1], summary=u'Deleted permission "%s"' % permission1, ), ), @@ -3571,8 +3571,8 @@ class test_managed_permissions(Declarative): desc='Delete %r with --force' % permission1, command=('permission_del', [permission1], {'force': True}), expected=dict( - result=dict(failed=u''), - value=permission1, + result=dict(failed=[]), + value=[permission1], summary=u'Deleted permission "%s"' % permission1, ), ), @@ -3826,8 +3826,8 @@ class test_permission_filters(Declarative): desc='Delete %r' % permission1, command=('permission_del', [permission1], {}), expected=dict( - result=dict(failed=u''), - value=permission1, + result=dict(failed=[]), + value=[permission1], summary=u'Deleted permission "%s"' % permission1, ) ), diff --git a/ipatests/test_xmlrpc/test_privilege_plugin.py b/ipatests/test_xmlrpc/test_privilege_plugin.py index 0f0e2f046..3d59c552a 100644 --- a/ipatests/test_xmlrpc/test_privilege_plugin.py +++ b/ipatests/test_xmlrpc/test_privilege_plugin.py @@ -410,8 +410,8 @@ class test_privilege(Declarative): desc='Delete %r' % privilege1, command=('privilege_del', [privilege1], {}), expected=dict( - result=dict(failed=u''), - value=privilege1, + result=dict(failed=[]), + value=[privilege1], summary=u'Deleted privilege "%s"' % privilege1, ) ), diff --git a/ipatests/test_xmlrpc/test_radiusproxy_plugin.py b/ipatests/test_xmlrpc/test_radiusproxy_plugin.py index d3be060e9..beb0b8c38 100644 --- a/ipatests/test_xmlrpc/test_radiusproxy_plugin.py +++ b/ipatests/test_xmlrpc/test_radiusproxy_plugin.py @@ -373,9 +373,9 @@ class test_raduisproxy(Declarative): desc='Delete %r' % radius1, command=('radiusproxy_del', [radius1], {}), expected=dict( - value=radius1, + value=[radius1], summary=u'Deleted RADIUS proxy server "%s"' % radius1, - result=dict(failed=u''), + result=dict(failed=[]), ), ), diff --git a/ipatests/test_xmlrpc/test_range_plugin.py b/ipatests/test_xmlrpc/test_range_plugin.py index 562bcf638..3b7a393e8 100644 --- a/ipatests/test_xmlrpc/test_range_plugin.py +++ b/ipatests/test_xmlrpc/test_range_plugin.py @@ -323,8 +323,8 @@ class test_range(Declarative): desc='Delete user %r' % user1, command=('user_del', [user1], {}), expected=dict( - result=dict(failed=u''), - value=user1, + result=dict(failed=[]), + value=[user1], summary=u'Deleted user "%s"' % user1, ), ), @@ -334,8 +334,8 @@ class test_range(Declarative): desc='Delete group %r' % group1, command=('group_del', [group1], {}), expected=dict( - result=dict(failed=u''), - value=group1, + result=dict(failed=[]), + value=[group1], summary=u'Deleted group "%s"' % group1, ), ), @@ -345,8 +345,8 @@ class test_range(Declarative): desc='Delete ID range %r' % testrange1, command=('idrange_del', [testrange1], {}), expected=dict( - result=dict(failed=u''), - value=testrange1, + result=dict(failed=[]), + value=[testrange1], summary=u'Deleted ID range "%s"' % testrange1, ), ), @@ -442,8 +442,8 @@ class test_range(Declarative): desc='Delete ID range %r' % testrange2, command=('idrange_del', [testrange2], {}), expected=dict( - result=dict(failed=u''), - value=testrange2, + result=dict(failed=[]), + value=[testrange2], summary=u'Deleted ID range "%s"' % testrange2, ), ), @@ -476,8 +476,8 @@ class test_range(Declarative): desc='Delete ID range %r' % testrange8, command=('idrange_del', [testrange8], {}), expected=dict( - result=dict(failed=u''), - value=testrange8, + result=dict(failed=[]), + value=[testrange8], summary=u'Deleted ID range "%s"' % testrange8, ), ), @@ -486,8 +486,8 @@ class test_range(Declarative): desc='Delete non-active AD trusted range %r' % testrange9, command=('idrange_del', [testrange9], {}), expected=dict( - result=dict(failed=u''), - value=testrange9, + result=dict(failed=[]), + value=[testrange9], summary=u'Deleted ID range "%s"' % testrange9, ), ), diff --git a/ipatests/test_xmlrpc/test_realmdomains_plugin.py b/ipatests/test_xmlrpc/test_realmdomains_plugin.py index 1d4dda3d2..a47fd6b98 100644 --- a/ipatests/test_xmlrpc/test_realmdomains_plugin.py +++ b/ipatests/test_xmlrpc/test_realmdomains_plugin.py @@ -45,7 +45,7 @@ class test_realmdomains(Declarative): desc='Retrieve realm domains', command=('realmdomains_show', [], {}), expected=dict( - value=u'', + value=None, summary=None, result=dict( dn=dn, @@ -57,7 +57,7 @@ class test_realmdomains(Declarative): desc='Retrieve realm domains - print all attributes', command=('realmdomains_show', [], {'all': True}), expected=dict( - value=u'', + value=None, summary=None, result=dict( dn=dn, @@ -80,7 +80,7 @@ class test_realmdomains(Declarative): desc='Replace list of realm domains with "%s"' % [our_domain, new_domain_1], command=('realmdomains_mod', [], {'associateddomain': [our_domain, new_domain_1]}), expected=dict( - value=u'', + value=None, summary=None, result=dict( associateddomain=[our_domain, new_domain_1], @@ -91,7 +91,7 @@ class test_realmdomains(Declarative): desc='Add domain "%s" to list' % new_domain_2, command=('realmdomains_mod', [], {'add_domain': new_domain_2}), expected=dict( - value=u'', + value=None, summary=None, result=dict( associateddomain=[our_domain, new_domain_1, new_domain_2], @@ -102,7 +102,7 @@ class test_realmdomains(Declarative): desc='Delete domain "%s" from list' % new_domain_2, command=('realmdomains_mod', [], {'del_domain': new_domain_2}), expected=dict( - value=u'', + value=None, summary=None, result=dict( associateddomain=[our_domain, new_domain_1], @@ -113,7 +113,7 @@ class test_realmdomains(Declarative): desc='Add domain "%s" and delete domain "%s"' % (new_domain_2, new_domain_1), command=('realmdomains_mod', [], {'add_domain': new_domain_2, 'del_domain': new_domain_1}), expected=dict( - value=u'', + value=None, summary=None, result=dict( associateddomain=[our_domain, new_domain_2], @@ -163,7 +163,7 @@ class test_realmdomains(Declarative): desc='Add an invalid domain "%s" with --force option' % bad_domain, command=('realmdomains_mod', [], {'add_domain': bad_domain, 'force': True}), expected=dict( - value=u'', + value=None, summary=None, result=dict( associateddomain=[our_domain, new_domain_2, bad_domain], diff --git a/ipatests/test_xmlrpc/test_role_plugin.py b/ipatests/test_xmlrpc/test_role_plugin.py index 119bfb1a8..f400b0fa8 100644 --- a/ipatests/test_xmlrpc/test_role_plugin.py +++ b/ipatests/test_xmlrpc/test_role_plugin.py @@ -468,8 +468,8 @@ class test_role(Declarative): desc='Delete %r' % group1, command=('group_del', [group1], {}), expected=dict( - result=dict(failed=u''), - value=group1, + result=dict(failed=[]), + value=[group1], summary=u'Deleted group "testgroup1"', ) ), @@ -554,8 +554,8 @@ class test_role(Declarative): desc='Delete %r' % role1, command=('role_del', [role1], {}), expected=dict( - result=dict(failed=u''), - value=role1, + result=dict(failed=[]), + value=[role1], summary=u'Deleted role "%s"' % role1, ) ), @@ -604,8 +604,8 @@ class test_role(Declarative): desc='Delete %r' % role2, command=('role_del', [role2], {}), expected=dict( - result=dict(failed=u''), - value=role2, + result=dict(failed=[]), + value=[role2], summary=u'Deleted role "%s"' % role2, ) ), diff --git a/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py b/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py index 9089a1c5e..c987a0c53 100644 --- a/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py +++ b/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py @@ -572,8 +572,8 @@ class test_selinuxusermap(Declarative): desc='Try to delete similarly named HBAC rule %r' % hbacrule2, command=('hbacrule_del', [hbacrule2], {}), expected=dict( - result=dict(failed=u''), - value=hbacrule2, + result=dict(failed=[]), + value=[hbacrule2], summary=u'Deleted HBAC rule "%s"' % hbacrule2, ) ), @@ -584,8 +584,8 @@ class test_selinuxusermap(Declarative): desc='Delete %r' % rule1, command=('selinuxusermap_del', [rule1], {}), expected=dict( - result=dict(failed=u''), - value=rule1, + result=dict(failed=[]), + value=[rule1], summary=u'Deleted SELinux User Map "%s"' % rule1, ) ), @@ -780,8 +780,8 @@ class test_selinuxusermap(Declarative): desc='Delete %r' % rule1, command=('selinuxusermap_del', [rule1], {}), expected=dict( - result=dict(failed=u''), - value=rule1, + result=dict(failed=[]), + value=[rule1], summary=u'Deleted SELinux User Map "%s"' % rule1, ) ), @@ -823,8 +823,8 @@ class test_selinuxusermap(Declarative): desc='Delete %r' % rule1, command=('selinuxusermap_del', [rule1], {}), expected=dict( - result=dict(failed=u''), - value=rule1, + result=dict(failed=[]), + value=[rule1], summary=u'Deleted SELinux User Map "%s"' % rule1, ) ), @@ -865,8 +865,8 @@ class test_selinuxusermap(Declarative): desc='Delete %r' % rule1, command=('selinuxusermap_del', [rule1], {}), expected=dict( - result=dict(failed=u''), - value=rule1, + result=dict(failed=[]), + value=[rule1], summary=u'Deleted SELinux User Map "%s"' % rule1, ) ), @@ -899,8 +899,8 @@ class test_selinuxusermap(Declarative): desc='Delete %r' % rule1, command=('selinuxusermap_del', [rule1], {}), expected=dict( - result=dict(failed=u''), - value=rule1, + result=dict(failed=[]), + value=[rule1], summary=u'Deleted SELinux User Map "%s"' % rule1, ) ), diff --git a/ipatests/test_xmlrpc/test_service_plugin.py b/ipatests/test_xmlrpc/test_service_plugin.py index c11612e6b..532d9888c 100644 --- a/ipatests/test_xmlrpc/test_service_plugin.py +++ b/ipatests/test_xmlrpc/test_service_plugin.py @@ -543,9 +543,9 @@ class test_service(Declarative): desc='Delete %r' % service1, command=('service_del', [service1], {}), expected=dict( - value=service1, + value=[service1], summary=u'Deleted service "%s"' % service1, - result=dict(failed=u''), + result=dict(failed=[]), ), ), diff --git a/ipatests/test_xmlrpc/test_sudocmd_plugin.py b/ipatests/test_xmlrpc/test_sudocmd_plugin.py index fe91705c2..2bcf4920f 100644 --- a/ipatests/test_xmlrpc/test_sudocmd_plugin.py +++ b/ipatests/test_xmlrpc/test_sudocmd_plugin.py @@ -281,9 +281,9 @@ class test_sudocmd(Declarative): desc='Delete %r' % sudocmd1, command=('sudocmd_del', [sudocmd1], {}), expected=dict( - value=sudocmd1, + value=[sudocmd1], summary=u'Deleted Sudo Command "%s"' % sudocmd1, - result=dict(failed=u''), + result=dict(failed=[]), ), ), diff --git a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py index 397d47683..281b0a10c 100644 --- a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py +++ b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py @@ -600,8 +600,8 @@ class test_sudocmdgroup(Declarative): desc='Delete %r' % sudocmdgroup1, command=('sudocmdgroup_del', [sudocmdgroup1], {}), expected=dict( - result=dict(failed=u''), - value=sudocmdgroup1, + result=dict(failed=[]), + value=[sudocmdgroup1], summary=u'Deleted Sudo Command Group "testsudocmdgroup1"', ) ), @@ -638,8 +638,8 @@ class test_sudocmdgroup(Declarative): desc='Delete %r' % sudocmdgroup2, command=('sudocmdgroup_del', [sudocmdgroup2], {}), expected=dict( - result=dict(failed=u''), - value=sudocmdgroup2, + result=dict(failed=[]), + value=[sudocmdgroup2], summary=u'Deleted Sudo Command Group "testsudocmdgroup2"', ) ), @@ -676,8 +676,8 @@ class test_sudocmdgroup(Declarative): desc='Now delete the sudo command %r' % sudocmd1, command=('sudocmd_del', [sudocmd1], {}), expected=dict( - result=dict(failed=u''), - value=sudocmd1, + result=dict(failed=[]), + value=[sudocmd1], summary=u'Deleted Sudo Command "%s"' % sudocmd1, ) ), diff --git a/ipatests/test_xmlrpc/test_user_plugin.py b/ipatests/test_xmlrpc/test_user_plugin.py index b7febe745..edeebc965 100644 --- a/ipatests/test_xmlrpc/test_user_plugin.py +++ b/ipatests/test_xmlrpc/test_user_plugin.py @@ -519,9 +519,9 @@ class test_user(Declarative): desc='Delete "%s"' % user1, command=('user_del', [user1], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % user1, - value=user1, + value=[user1], ), ), @@ -574,9 +574,9 @@ class test_user(Declarative): desc='Delete "%s"' % user1, command=('user_del', [user1], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % user1, - value=user1, + value=[user1], ), ), @@ -646,9 +646,9 @@ class test_user(Declarative): desc='Delete "%s" and "%s" at the same time' % (user1, user2), command=('user_del', [user1, user2], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "tuser1,tuser2"', - value=u','.join((user1, user2)), + value=[user1, user2], ), ), @@ -782,9 +782,9 @@ class test_user(Declarative): desc='Delete "%s"' % user1, command=('user_del', [user1], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % user1, - value=user1, + value=[user1], ), ), @@ -811,9 +811,9 @@ class test_user(Declarative): desc='Delete "%s"' % user1, command=('user_del', [user1], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % user1, - value=user1, + value=[user1], ), ), @@ -849,9 +849,9 @@ class test_user(Declarative): desc='Delete "%s"' % user2, command=('user_del', [user2], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % user2, - value=user2, + value=[user2], ), ), @@ -892,9 +892,9 @@ class test_user(Declarative): desc='Delete "%s"' % user1, command=('user_del', [user1], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % user1, - value=user1, + value=[user1], ), ), @@ -932,9 +932,9 @@ class test_user(Declarative): desc='Delete "%s"' % user1, command=('user_del', [user1], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % user1, - value=user1, + value=[user1], ), ), @@ -971,9 +971,9 @@ class test_user(Declarative): desc='Delete "%s"' % user1, command=('user_del', [user1], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % user1, - value=user1, + value=[user1], ), ), @@ -1008,9 +1008,9 @@ class test_user(Declarative): desc='Delete "%s"' % user2, command=('user_del', [user2], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % user2, - value=user2, + value=[user2], ), ), @@ -1116,9 +1116,9 @@ class test_user(Declarative): desc='Delete %r' % renameduser1, command=('user_del', [renameduser1], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % renameduser1, - value=renameduser1, + value=[renameduser1], ), ), @@ -1255,9 +1255,9 @@ class test_user(Declarative): desc='Delete 2nd admin "%s"' % admin2, command=('user_del', [admin2], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % admin2, - value=admin2, + value=[admin2], ), ), @@ -1324,9 +1324,9 @@ class test_user(Declarative): desc='Delete "%s"' % user2, command=('user_del', [user2], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % user2, - value=user2, + value=[user2], ), ), @@ -1362,9 +1362,9 @@ class test_user(Declarative): desc='Delete "%s"' % user1, command=('user_del', [user1], {}), expected=dict( - result=dict(failed=u''), + result=dict(failed=[]), summary=u'Deleted user "%s"' % user1, - value=user1, + value=[user1], ), ), |