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

Merge branch '1.8.x'

Browse Source
This commit is contained in:
Antoine Nguyen
2017-08-11 15:19:06 +02:00
parent 2097ca3fa2 5a92aa9a5f
commit 978c95e4b8
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/management/commands/subcommands/_mx.py
+4 -2
View File
@@ -156,7 +156,8 @@ class CheckMXRecords(BaseCommand):
emails = list(options["email"])
if not options["skip_admin_emails"]:
emails.extend(
domain.admins.exclude(email="").values_list("email", flat=True)
domain.admins.exclude(mailbox__isnull=True)
.values_list("email", flat=True)
)
if not len(emails):
return
@@ -205,7 +206,8 @@ class CheckMXRecords(BaseCommand):
emails = list(options["email"])
if not options["skip_admin_emails"]:
emails.extend(
domain.admins.exclude(email="").values_list("email", flat=True)
domain.admins.exclude(mailbox__isnull=True)
.values_list("email", flat=True)
)
if not len(emails):
return
modoboa/admin/tests/test_mx.py
+14
View File
@@ -9,6 +9,7 @@ from django.core import management
from django.core.urlresolvers import reverse
from django.test import override_settings
from modoboa.core import factories as core_factories
from modoboa.lib.tests import ModoTestCase
from .. import factories
@@ -25,6 +26,18 @@ class MXTestCase(ModoTestCase):
cls.domain = factories.DomainFactory(name="modoboa.org")
# should not exist
cls.bad_domain = factories.DomainFactory(name="pouet.com")
# Add domain admin with mailbox
mb = factories.MailboxFactory(
address="admin", domain=cls.bad_domain,
user__username="admin@pouet.com",
user__groups=("DomainAdmins", )
)
cls.bad_domain.add_admin(mb.user)
# Add domain admin with no mailbox
admin = core_factories.UserFactory(
username="admin2@pouet.com", groups=("DomainAdmins", ))
cls.bad_domain.add_admin(admin)
cls.localconfig.parameters.set_value("valid_mxs", "127.0.0.1")
cls.localconfig.save()
models.MXRecord.objects.all().delete()
@@ -63,6 +76,7 @@ class MXTestCase(ModoTestCase):
"modo", "check_mx", "--domain", str(self.bad_domain.pk))
self.assertFalse(
models.MXRecord.objects.filter(domain=self.bad_domain).exists())
self.assertEqual(len(mail.outbox), 1)
management.call_command(
"modo", "check_mx", "--domain", "toto.com")