From dd63db87fdbb9667c1027edd700b4047b6983d1f Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Wed, 18 Feb 2015 13:40:41 -0200 Subject: #294 - not failing service startup if smtp fails to start --- .../test/unit/adapter/services/test_mail_sender.py | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'service/test/unit/adapter/services') diff --git a/service/test/unit/adapter/services/test_mail_sender.py b/service/test/unit/adapter/services/test_mail_sender.py index 8536e5e3..0e7ec015 100644 --- a/service/test/unit/adapter/services/test_mail_sender.py +++ b/service/test/unit/adapter/services/test_mail_sender.py @@ -16,7 +16,7 @@ from twisted.trial import unittest from mockito import mock, when, verify, any, unstub -from pixelated.adapter.services.mail_sender import MailSender +from pixelated.adapter.services.mail_sender import MailSender, SMTPDownException from pixelated.adapter.model.mail import PixelatedMail, InputMail from test.support.test_helper import mail_dict from twisted.internet import reactor @@ -24,10 +24,14 @@ from twisted.internet.defer import Deferred class MailSenderTest(unittest.TestCase): + def setUp(self): + self.ensure_smtp_is_running_cb = lambda: True + self.ensure_smtp_is_not_running_cb = lambda: False + def test_sendmail(self): when(reactor).connectTCP('localhost', 4650, any()).thenReturn(None) input_mail = InputMail.from_dict(mail_dict()) - mail_sender = MailSender('someone@somedomain.tld') + mail_sender = MailSender('someone@somedomain.tld', self.ensure_smtp_is_running_cb) return self._succeed(mail_sender.sendmail(input_mail)) @@ -38,7 +42,8 @@ class MailSenderTest(unittest.TestCase): when(reactor).connectTCP('localhost', 4650, any()).thenReturn(None) input_mail = InputMail.from_dict(mail_dict()) - mail_sender = MailSender('someone@somedomain.tld') + + mail_sender = MailSender('someone@somedomain.tld', self.ensure_smtp_is_running_cb) sent_deferred = mail_sender.sendmail(input_mail) @@ -49,7 +54,7 @@ class MailSenderTest(unittest.TestCase): def test_senmail_returns_deffered(self): when(reactor).connectTCP('localhost', 4650, any()).thenReturn(None) input_mail = InputMail.from_dict(mail_dict()) - mail_sender = MailSender('someone@somedomain.tld') + mail_sender = MailSender('someone@somedomain.tld', self.ensure_smtp_is_running_cb) deferred = mail_sender.sendmail(input_mail) @@ -58,6 +63,18 @@ class MailSenderTest(unittest.TestCase): return self._succeed(deferred) + def test_doesnt_send_mail_if_smtp_is_not_running(self): + mail_sender = MailSender('someone@somedomain.tld', self.ensure_smtp_is_not_running_cb) + + deferred = mail_sender.sendmail({}) + + def _assert(_): + self.assertTrue(isinstance(deferred.result.value, SMTPDownException)) + + deferred.addErrback(_assert) + + return deferred + def _succeed(self, deferred): deferred.callback(None) return deferred -- cgit v1.2.3