github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(dns-resolver): correction lint

Browse Source
This commit is contained in:
Florian VANDENBULCKE
2018-10-14 18:55:02 +02:00
parent cbbe840522
commit 6c2fbb169a
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/lib.py
+7 -6
View File
@@ -198,23 +198,24 @@ def get_domain_mx_list(domain):
omit_final_dot=True, idna_codec=IDNA_2008_UTS_46)
ip_answers = dns.resolver.query(mx_domain)
except dns.resolver.NXDOMAIN as e:
logger.error(_("No DNS records found without MX for %s") % domain, exc_info=e)
logger.error(_("No DNS records found without MX for %s")
% domain, exc_info=e)
else:
for ip_answer in ip_answers:
for answer_set in ip_answer.response.answer:
for address in answer_set:
try:
mx_ip = ipaddress.ip_address(smart_text(address))
address_smart = smart_text(address)
mx_ip = ipaddress.ip_address(address_smart)
except ValueError as e:
logger.warning(
_("Invalid IP address format for %(domain)s; "
"%(addr)s")
_("Invalid IP address format for "
"%(domain)s; %(addr)s")
% {"domain": mx_domain,
"addr": smart_text(address)},
exc_info=e)
else:
result.append((mx_domain, mx_ip))
result.append((mx_domain, mx_ip))
return result
modoboa/admin/tests/test_mx.py
+5 -6
View File
@@ -117,12 +117,11 @@ class MXTestCase(ModoTestCase):
self.set_global_parameter("use_specific_dns_server", "123.45.67.89")
get_domain_mx_list("does-not-exist.example.com")
#@mock.patch("socket.getaddrinfo")
@mock.patch("ipaddress.ip_address")
@mock.patch.object(dns.resolver.Resolver, "query")
def test_get_domain_mx_list_logging(self, mock_query, mock_ip_address):
"""Test to get error loggins from specific DNS server."""
mock_query.side_effect = utils.mock_dns_query_result
#mock_getaddrinfo.side_effect = utils.mock_ip_query_result
mock_ip_address.side_effect = utils.mock_ip_address_result
with LogCapture("modoboa.admin") as log:
get_domain_mx_list("does-not-exist.example.com")
@@ -142,11 +141,11 @@ class MXTestCase(ModoTestCase):
_("DNS resolution timeout, unable to query %s at the moment")
% "timeout.example.com"),
("modoboa.admin", "ERROR",
_("No DNS records found without MX for %(domain)s")
% {"domain": "no-lookup.example.com"}),
_("No DNS records found without MX for %(domain)s")
% {"domain": "no-lookup.example.com"}),
("modoboa.admin", "WARNING",
_("Invalid IP address format for %(domain)s; %(addr)s")
% {"domain": "bad-response.example.com", "addr": "000.0.0.0"}),
_("Invalid IP address format for %(domain)s; %(addr)s")
% {"domain": "bad-response.example.com", "addr": "000.0.0.0"}),
)