mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-19 05:58:34 +02:00
@@ -97,8 +97,8 @@ class Command(BaseCommand):
|
||||
try:
|
||||
f(ope)
|
||||
except (OperationError, InternalError) as e:
|
||||
self.logger.critical("%s failed (reason: %s)",
|
||||
ope, str(e).encode("utf-8"))
|
||||
self.logger.critical(
|
||||
"%s failed (reason: %s)", ope, str(e).decode("utf-8"))
|
||||
else:
|
||||
self.logger.info("%s succeed", ope)
|
||||
ope.delete()
|
||||
|
||||
@@ -350,7 +350,6 @@ reversion.register(SenderAddress)
|
||||
|
||||
|
||||
class MailboxOperation(models.Model):
|
||||
|
||||
"""An operation on a mailbox."""
|
||||
|
||||
mailbox = models.ForeignKey(Mailbox, blank=True, null=True)
|
||||
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
echo "2.12"
|
||||
@@ -0,0 +1,86 @@
|
||||
"""Management command tests."""
|
||||
|
||||
import os
|
||||
import shutil
|
||||
import tempfile
|
||||
|
||||
import mock
|
||||
|
||||
from django.core.management import call_command
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.test import override_settings
|
||||
|
||||
from modoboa.lib.tests import ModoTestCase
|
||||
|
||||
from .. import factories
|
||||
from .. import models
|
||||
|
||||
|
||||
@override_settings(
|
||||
DOVECOT_LOOKUP_PATH=["{}/dovecot".format(os.path.dirname(__file__))])
|
||||
class MailboxOperationTestCase(ModoTestCase):
|
||||
"""Test management command."""
|
||||
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
"""Create test data."""
|
||||
super(MailboxOperationTestCase, cls).setUpTestData()
|
||||
factories.populate_database()
|
||||
|
||||
def setUp(self):
|
||||
"""Initiate test env."""
|
||||
super(MailboxOperationTestCase, self).setUp()
|
||||
self.workdir = tempfile.mkdtemp()
|
||||
path = "{}/test.com/admin".format(self.workdir)
|
||||
os.makedirs(path)
|
||||
self.set_global_parameter("handle_mailboxes", True)
|
||||
self.set_global_parameter("enable_admin_limits", False, app="limits")
|
||||
|
||||
def tearDown(self):
|
||||
"""Reset test env."""
|
||||
shutil.rmtree(self.workdir)
|
||||
|
||||
@mock.patch("modoboa.admin.models.Mailbox.mail_home")
|
||||
def test_delete_account(self, mail_home_mock):
|
||||
"""Check delete operation."""
|
||||
path = "{}/test.com/admin".format(self.workdir)
|
||||
mail_home_mock.__get__ = mock.Mock(return_value=path)
|
||||
mb = models.Mailbox.objects.select_related("user").get(
|
||||
address="admin", domain__name="test.com")
|
||||
self.ajax_post(
|
||||
reverse("admin:account_delete", args=[mb.user.pk]), {}
|
||||
)
|
||||
call_command("handle_mailbox_operations")
|
||||
self.assertFalse(models.MailboxOperation.objects.exists())
|
||||
self.assertFalse(os.path.exists(mb.mail_home))
|
||||
|
||||
@mock.patch("modoboa.admin.models.Mailbox.mail_home")
|
||||
def test_rename_account(self, mail_home_mock):
|
||||
"""Check rename operation."""
|
||||
path = "{}/test.com/admin".format(self.workdir)
|
||||
mail_home_mock.__get__ = mock.Mock(return_value=path)
|
||||
mb = models.Mailbox.objects.select_related("user").get(
|
||||
address="admin", domain__name="test.com")
|
||||
values = {
|
||||
"username": "admin2@test.com", "role": "DomainAdmins",
|
||||
"is_active": True, "email": "admin2@test.com"
|
||||
}
|
||||
self.ajax_post(
|
||||
reverse("admin:account_change", args=[mb.user.pk]), values
|
||||
)
|
||||
path = "{}/test.com/admin2".format(self.workdir)
|
||||
mail_home_mock.__get__ = mock.Mock(return_value=path)
|
||||
call_command("handle_mailbox_operations")
|
||||
self.assertFalse(models.MailboxOperation.objects.exists())
|
||||
self.assertTrue(os.path.exists(mb.mail_home))
|
||||
|
||||
@mock.patch("modoboa.admin.models.Mailbox.mail_home")
|
||||
def test_delete_domain(self, mail_home_mock):
|
||||
"""Check delete operation."""
|
||||
path = "{}/test.com/admin".format(self.workdir)
|
||||
mail_home_mock.__get__ = mock.Mock(return_value=path)
|
||||
domain = models.Domain.objects.get(name="test.com")
|
||||
self.ajax_post(reverse("admin:domain_delete", args=[domain.pk]))
|
||||
call_command("handle_mailbox_operations")
|
||||
self.assertFalse(models.MailboxOperation.objects.exists())
|
||||
self.assertFalse(os.path.exists(path))
|
||||
Reference in New Issue
Block a user