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

Increase coverage.

Browse Source
This commit is contained in:
Antoine Nguyen
2016-09-29 21:49:37 +02:00
parent ae67bfc697
commit 486100b59c
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/management/commands/subcommands/_mx.py
+15 -14
View File
@@ -98,14 +98,14 @@ class CheckMXRecords(BaseCommand):
else:
try:
# we must have a valid IP
address = ipaddress.ip_address(u'{}'.format(address))
address = ipaddress.ip_address(u"{}".format(address))
except ValueError:
pass
else:
record = models.MXRecord.objects.create(
domain=domain,
name=u'{}'.format(str(answer.exchange).strip(".")),
address=u'{}'.format(address),
name=u"{}".format(str(answer.exchange).strip(".")),
address=u"{}".format(address),
updated=now + delta)
yield record
@@ -177,7 +177,7 @@ class CheckMXRecords(BaseCommand):
for mx in mx_list]
valid_mxs = self.valid_mxs
if not mxs:
alerts.append(_("Domain {} as no MX record").format(domain))
alerts.append(_("Domain {} has no MX record").format(domain))
elif valid_mxs:
for subnet in valid_mxs:
for mx, addr in mxs:
@@ -188,7 +188,7 @@ class CheckMXRecords(BaseCommand):
mx_names = [
"{0.name} ({0.address})".format(mx) for mx in mx_list]
alerts.append(
_("Domain {0} got an invalid MX record. Got {1}").format(
_("MX record for domain {0} is invalid: {1}").format(
domain, ", ".join(mx_names))
)
if not alerts:
@@ -241,19 +241,20 @@ class CheckMXRecords(BaseCommand):
models.DNSBLResult.objects.exclude(
provider__in=self.providers).delete()
if options['domain']:
if options["domain"]:
domains = []
for domain in options['domain']:
if isinstance(domain, models.Domain):
domains.append(domain)
elif domain.isdigit():
domains.append(models.Domain.objects.get(domain))
else:
domains.append(models.Domain.objects.filter(name=domain))
for domain in options["domain"]:
try:
if domain.isdigit():
domains.append(models.Domain.objects.get(pk=domain))
else:
domains.append(models.Domain.objects.get(name=domain))
except models.Domain.DoesNotExist:
pass
else:
domains = models.Domain.objects.filter(enabled=True)
options.pop('domain')
options.pop("domain")
for domain in domains:
self.check_domain(domain, **options)
modoboa/admin/tests/test_mx.py
+17 -2
View File
@@ -19,8 +19,9 @@ class MXTestCase(ModoTestCase):
"""Create some data."""
super(MXTestCase, cls).setUpTestData()
cls.domain = factories.DomainFactory(name="modoboa.org")
factories.DomainFactory(name="pouet.com") # should not exist
parameters.save_admin('VALID_MXS', '127.0.0.1', app='admin')
# should not exist
cls.bad_domain = factories.DomainFactory(name="pouet.com")
parameters.save_admin("VALID_MXS", "127.0.0.1")
models.MXRecord.objects.all().delete()
def test_management_command(self):
@@ -44,6 +45,20 @@ class MXTestCase(ModoTestCase):
qs = models.MXRecord.objects.filter(domain=self.domain)
self.assertEqual(id, qs[0].id)
def test_single_domain_update(self):
"""Update only one domain."""
management.call_command(
"modo", "check_mx", "--domain", self.domain.name)
self.assertTrue(
models.MXRecord.objects.filter(domain=self.domain).exists())
self.assertFalse(
models.MXRecord.objects.filter(domain=self.bad_domain).exists())
management.call_command(
"modo", "check_mx", "--domain", str(self.bad_domain.pk))
self.assertFalse(
models.MXRecord.objects.filter(domain=self.bad_domain).exists())
class DNSBLTestCase(ModoTestCase):
"""TestCase for DNSBL related features."""