summaryrefslogtreecommitdiffstats
path: root/ipatests/test_xmlrpc/test_dns_plugin.py
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2014-03-27 14:04:00 +0100
committerPetr Viktorin <pviktori@redhat.com>2014-04-18 14:59:20 +0200
commit4314d02fbf9ef1cb9543ecf76a8d22e79d250214 (patch)
tree8c6ac601e881712e8cf7c25fce420026a3762553 /ipatests/test_xmlrpc/test_dns_plugin.py
parentc644b47492e22370bc71f57e5ac46b50f9b4e247 (diff)
downloadfreeipa-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_dns_plugin.py')
-rw-r--r--ipatests/test_xmlrpc/test_dns_plugin.py24
1 files changed, 12 insertions, 12 deletions
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': []},
},
),