gnuviech/gva
1
0
Fork 0
Code Issues 6 Pull requests Releases Wiki Activity

Refactor managemails to use signals

Browse source 
- use signals to trigger Celery tasks to create and delete mailboxes
- add generic TestCaseWithCeleryTasks class to handle celery task tests
  in a uniform way
This commit is contained in:
Jan Dittberner 2023-02-19 13:45:30 +01:00
parent d6fc29a2b8
commit 610f8976fc
5 changed files with 114 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

49
gnuviechadmin/managemails/tests/test_models.py
View file

@ -1,24 +1,20 @@
"""
This module contains tests for :py:mod:`managemails.models`
"""
from unittest.mock import patch
from django.contrib.auth import get_user_model
from django.test import TestCase, TransactionTestCase
from django.test.utils import override_settings
from passlib.hash import sha512_crypt
from passlib.handlers.sha2_crypt import sha512_crypt
from domains.models import MailDomain
from managemails.models import MailAddress, Mailbox
from osusers.models import User
from taskresults.tests.testutils import TestCaseWithCeleryTasks
Customer = get_user_model()
@override_settings(
CELERY_ALWAYS_EAGER=True, CELERY_CACHE_BACKEND="memory", BROKER_BACKEND="memory"
)
class MailboxTest(TestCase):
class MailboxTest(TestCaseWithCeleryTasks):
def setUp(self):
super(MailboxTest, self).setUp()
self.customer = Customer.objects.create_user("test")
@ -35,22 +31,32 @@ class MailboxTest(TestCase):
mb.set_password("test")
self.assertEqual(str(mb), "test")
@patch("managemails.models.create_file_mailbox")
def test_save(self, create_file_mailbox_task):
def test_save(self):
user = User.objects.create_user(self.customer)
self.resetCeleryTasks()
mb = Mailbox.objects.create_mailbox(user)
self.assertIsNotNone(mb.pk)
create_file_mailbox_task.delay.assert_called_with(user.username, mb.username)
@patch("managemails.models.delete_file_mailbox")
def test_delete(self, delete_file_mailbox_task):
self.assertCeleryTasksRun([
(1, "handle_mailbox_created"),
])
def test_delete(self):
user = User.objects.create_user(self.customer)
mb = Mailbox.objects.create_mailbox(user)
self.resetCeleryTasks()
mb.delete()
self.assertIsNone(mb.pk)
delete_file_mailbox_task.delay.assert_called_with(user.username, mb.username)
def test_get_mailaddresses(self):
self.assertCeleryTasksRun([
(1, "handle_mailbox_deleted"),
])
def test_get_mail_addresses(self):
user = User.objects.create_user(self.customer)
mb = Mailbox.objects.create_mailbox(user)
md = MailDomain.objects.create(domain="example.org")
@ -61,10 +67,7 @@ class MailboxTest(TestCase):
self.assertIn(address, mailaddresses)
@override_settings(
CELERY_ALWAYS_EAGER=True, CELERY_CACHE_BACKEND="memory", BROKER_BACKEND="memory"
)
class MailAddressTest(TransactionTestCase):
class MailAddressTest(TestCaseWithCeleryTasks):
def test__str__(self):
md = MailDomain.objects.create(domain="example.org")
ma = MailAddress.objects.create(localpart="test", domain=md)
@ -214,10 +217,7 @@ class MailAddressTest(TransactionTestCase):
self.assertEqual(mafwds[0].target, "test2@example.org")
@override_settings(
CELERY_ALWAYS_EAGER=True, CELERY_CACHE_BACKEND="memory", BROKER_BACKEND="memory"
)
class MailboxManagerTest(TransactionTestCase):
class MailboxManagerTest(TestCaseWithCeleryTasks):
def setUp(self):
super(MailboxManagerTest, self).setUp()
self.customer = Customer.objects.create_user("test")
@ -302,10 +302,7 @@ class MailboxManagerTest(TransactionTestCase):
self.assertTrue(sha512_crypt.verify("test", mailbox.password))
@override_settings(
CELERY_ALWAYS_EAGER=True, CELERY_CACHE_BACKEND="memory", BROKER_BACKEND="memory"
)
class MailAddressMailboxTest(TestCase):
class MailAddressMailboxTest(TestCaseWithCeleryTasks):
def setUp(self):
super(MailAddressMailboxTest, self).setUp()
self.customer = Customer.objects.create_user("test")