From a0c47c49c1478727e887510fc29a8b614e36a4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Thu, 23 Feb 2017 09:04:44 +0100
Subject: [PATCH] Changed DNS log.
---
tests/test_dns_records.py | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/tests/test_dns_records.py b/tests/test_dns_records.py
index 5cdf89c3..938f2a80 100755
--- a/tests/test_dns_records.py
+++ b/tests/test_dns_records.py
@@ -28,27 +28,26 @@ resolvers = get_dns_servers()
def get_result(output):
for line in output.split('\n'):
- if "has address " in line:
- return line.split("has address ")[1]
+ if 'has address ' in line:
+ return line.split('has address ')[1]
def check_dns(hostname, expected_ip):
all_ok = True
for resolver in resolvers:
- status, output = subprocess.getstatusoutput("host %s %s" % (hostname, resolver))
- success = (status == 0)
- if success:
+ status, output = subprocess.getstatusoutput('host "%s" "%s"' % (hostname, resolver))
+ if status == 0:
color = GREEN
address = get_result(output)
if address != expected_ip:
- print('Expected ip was: %s, got %s' % (expected_ip, address))
+ print('Expected ip was: "%s", got "%s".' % (expected_ip, address))
color = RED
all_ok = False
else:
color = RED
all_ok = False
- address = "FAIL"
- print('%sDNS resolution of %s on server %s returned %s%s' % (color, hostname, resolver, address, DEF))
+ address = 'FAIL'
+ print('%sDNS resolution of "%s" on server "%s" returned "%s".%s' % (color, hostname, resolver, address, DEF))
return all_ok
@@ -68,7 +67,7 @@ conf_resolvers_keys = (
for conf_resolver_key in conf_resolvers_keys:
conf_resolver = conf.get(conf_resolver_key)
if conf_resolver and conf_resolver != '0' and conf_resolver not in resolvers:
- print('Resolver %s not configured on the system' % conf_resolver)
+ print('Resolver %s not configured on the system.' % conf_resolver)
all_ok = False
ip = conf.get('NETWORK_IP_NAT')
@@ -77,7 +76,7 @@ if not ip or ip == '0':
if not ip or ip == '0':
if not all_ok:
sys.exit(1)
- # cannot test resolution IP
+ print('No IP set in configuration file, unable to test DNS.')
sys.exit(2)
conf_servers = (
--
GitLab