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

Bumped dnspython to 2.1.0

Browse Source
This commit is contained in:
Antoine Nguyen
2021-06-28 16:24:04 +02:00
parent 210315f69c
commit eec5a95155
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/lib.py
+1 -1
View File
@@ -184,7 +184,7 @@ def get_dns_records(name, typ, resolver=None):
if not resolver:
resolver = get_dns_resolver()
try:
dns_answers = resolver.query(name, typ)
dns_answers = resolver.resolve(name, typ, search=True)
except dns.resolver.NXDOMAIN as e:
logger.error(_("No DNS record found for %s") % name, exc_info=e)
except dns.resolver.NoAnswer as e:
modoboa/admin/tests/test_mx.py
+9 -9
View File
@@ -48,7 +48,7 @@ class MXTestCase(ModoTestCase):
@mock.patch("gevent.socket.gethostbyname")
@mock.patch("socket.getaddrinfo")
@mock.patch.object(dns.resolver.Resolver, "query")
@mock.patch.object(dns.resolver.Resolver, "resolve")
def test_management_command(
self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
"""Check that command works fine."""
@@ -76,7 +76,7 @@ class MXTestCase(ModoTestCase):
@mock.patch("gevent.socket.gethostbyname")
@mock.patch("socket.getaddrinfo")
@mock.patch.object(dns.resolver.Resolver, "query")
@mock.patch.object(dns.resolver.Resolver, "resolve")
def test_single_domain_update(
self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
"""Update only one domain."""
@@ -101,7 +101,7 @@ class MXTestCase(ModoTestCase):
@mock.patch("gevent.socket.gethostbyname")
@mock.patch("socket.getaddrinfo")
@mock.patch.object(dns.resolver.Resolver, "query")
@mock.patch.object(dns.resolver.Resolver, "resolve")
def test_invalid_mx(
self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
"""Test to check if invalid MX records are detected."""
@@ -125,7 +125,7 @@ class MXTestCase(ModoTestCase):
self.assertEqual(len(mail.outbox), 1)
@mock.patch("socket.getaddrinfo")
@mock.patch.object(dns.resolver.Resolver, "query")
@mock.patch.object(dns.resolver.Resolver, "resolve")
def test_get_mx_list_dns_server(self, mock_query, mock_getaddrinfo):
"""Test to get mx list from specific DNS server."""
mock_query.side_effect = utils.mock_dns_query_result
@@ -134,7 +134,7 @@ class MXTestCase(ModoTestCase):
get_domain_mx_list("does-not-exist.example.com")
@mock.patch("ipaddress.ip_address")
@mock.patch.object(dns.resolver.Resolver, "query")
@mock.patch.object(dns.resolver.Resolver, "resolve")
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
@@ -190,7 +190,7 @@ class DNSBLTestCase(ModoTestCase):
@mock.patch("gevent.socket.gethostbyname")
@mock.patch("socket.getaddrinfo")
@mock.patch.object(dns.resolver.Resolver, "query")
@mock.patch.object(dns.resolver.Resolver, "resolve")
def test_management_command(
self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
"""Check that command works fine."""
@@ -211,7 +211,7 @@ class DNSBLTestCase(ModoTestCase):
@mock.patch("gevent.socket.gethostbyname")
@mock.patch("socket.getaddrinfo")
@mock.patch.object(dns.resolver.Resolver, "query")
@mock.patch.object(dns.resolver.Resolver, "resolve")
def test_notifications(
self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
"""Check notifications."""
@@ -224,7 +224,7 @@ class DNSBLTestCase(ModoTestCase):
@mock.patch("gevent.socket.gethostbyname")
@mock.patch("socket.getaddrinfo")
@mock.patch.object(dns.resolver.Resolver, "query")
@mock.patch.object(dns.resolver.Resolver, "resolve")
def test_management_command_no_dnsbl(
self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
"""Check that command works fine without dnsbl."""
@@ -251,7 +251,7 @@ class DNSChecksTestCase(ModoTestCase):
@mock.patch("gevent.socket.gethostbyname")
@mock.patch("socket.getaddrinfo")
@mock.patch.object(dns.resolver.Resolver, "query")
@mock.patch.object(dns.resolver.Resolver, "resolve")
def test_management_command(
self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
"""Check that command works fine."""
requirements.txt
+1 -1
View File
@@ -19,7 +19,7 @@ drf-flex-fields
passlib~=1.7.4
bcrypt # Requires libffi-dev and python-dev
dnspython==1.16.0
dnspython==2.1.0
feedparser==6.0.8
greenlet==0.4.17
gevent==20.9.0