summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2012-02-10 12:54:49 +0100
committerMartin Kosek <mkosek@redhat.com>2012-02-24 09:40:40 +0100
commit2cf58937615c28527d1c78f883dad8726331c6df (patch)
treef1d696b248406bb2daa50c4e4c0e9a275bebf035 /tests
parent1816643a43802ca2a353930cb2bbb2781b39c80f (diff)
downloadfreeipa-2cf58937615c28527d1c78f883dad8726331c6df.tar.gz
freeipa-2cf58937615c28527d1c78f883dad8726331c6df.tar.xz
freeipa-2cf58937615c28527d1c78f883dad8726331c6df.zip
Global DNS options
Implement API for DNS global options supported in bind-dyndb-ldap. Currently, global DNS option overrides any relevant option in named.conf. Thus they are not filled by default they are left as a possibility for a user. Bool encoding had to be fixed so that Bool LDAP attribute can also be deleted and not just set to True or False. https://fedorahosted.org/freeipa/ticket/2216
Diffstat (limited to 'tests')
-rw-r--r--tests/test_xmlrpc/test_dns_plugin.py14
-rw-r--r--tests/test_xmlrpc/xmlrpc_test.py2
2 files changed, 15 insertions, 1 deletions
diff --git a/tests/test_xmlrpc/test_dns_plugin.py b/tests/test_xmlrpc/test_dns_plugin.py
index 9d83d924e..4ad67ce8c 100644
--- a/tests/test_xmlrpc/test_dns_plugin.py
+++ b/tests/test_xmlrpc/test_dns_plugin.py
@@ -64,6 +64,7 @@ class test_dns(Declarative):
('dnsrecord_del', [dnszone1, dnsres1], {'del_all' : True}),
('dnszone_del', [dnszone2], {}),
('dnszone_del', [revdnszone1], {}),
+ ('dnsconfig_mod', [], {'idnsforwarders' : None,})
]
tests = [
@@ -774,6 +775,19 @@ class test_dns(Declarative):
dict(
+ desc='Update global DNS settings',
+ command=('dnsconfig_mod', [], {'idnsforwarders' : [u'80.142.15.80'],}),
+ expected={
+ 'value': u'',
+ 'summary': None,
+ 'result': {
+ 'idnsforwarders': [u'80.142.15.80'],
+ },
+ },
+ ),
+
+
+ dict(
desc='Delete zone %r' % dnszone1,
command=('dnszone_del', [dnszone1], {}),
expected={
diff --git a/tests/test_xmlrpc/xmlrpc_test.py b/tests/test_xmlrpc/xmlrpc_test.py
index 4966cb1fb..fd30cc63b 100644
--- a/tests/test_xmlrpc/xmlrpc_test.py
+++ b/tests/test_xmlrpc/xmlrpc_test.py
@@ -222,7 +222,7 @@ class Declarative(XMLRPC_test):
)
try:
api.Command[cmd](*args, **options)
- except errors.NotFound:
+ except (errors.NotFound, errors.EmptyModlist):
pass
def test_generator(self):