From 50f599dcc5297b3b29827b2ac02e6a9885b52d62 Mon Sep 17 00:00:00 2001 From: Jefferson Stachelski Date: Wed, 4 Nov 2015 18:45:03 -0200 Subject: Issue #499 - removed the local SMTP --- .../test/unit/adapter/services/test_mail_sender.py | 62 +--------------------- 1 file changed, 1 insertion(+), 61 deletions(-) (limited to 'service/test/unit/adapter') diff --git a/service/test/unit/adapter/services/test_mail_sender.py b/service/test/unit/adapter/services/test_mail_sender.py index 38da726b..f7103b60 100644 --- a/service/test/unit/adapter/services/test_mail_sender.py +++ b/service/test/unit/adapter/services/test_mail_sender.py @@ -18,8 +18,7 @@ from twisted.mail.smtp import User from twisted.trial import unittest from mockito import mock, when, verify, any, unstub -from pixelated.adapter.services.mail_sender import LocalSmtpMailSender, SMTPDownException, MailSender, \ - MailSenderException +from pixelated.adapter.services.mail_sender import MailSender, MailSenderException from pixelated.adapter.model.mail import InputMail from pixelated.bitmask_libraries.smtp import LeapSMTPConfig from pixelated.support.functional import flatten @@ -77,62 +76,3 @@ class MailSenderTest(unittest.TestCase): except MailSenderException, e: for recipient in flatten([input_mail.to, input_mail.cc, input_mail.bcc]): self.assertTrue(recipient in e.email_error_map) - - -class LocalSmtpMailSenderTest(unittest.TestCase): - def setUp(self): - self.smtp = mock() - self.smtp.local_smtp_port_number = 4650 - self.smtp.ensure_running = lambda: True - - def test_sendmail(self): - when(reactor).connectTCP('localhost', 4650, any()).thenReturn(None) - input_mail = InputMail.from_dict(mail_dict()) - mail_sender = LocalSmtpMailSender('someone@somedomain.tld', self.smtp) - - return self._succeed(mail_sender.sendmail(input_mail)) - - def tearDown(self): - unstub() - - def test_sendmail_uses_twisted(self): - when(reactor).connectTCP('localhost', 4650, any()).thenReturn(None) - - input_mail = InputMail.from_dict(mail_dict()) - - mail_sender = LocalSmtpMailSender('someone@somedomain.tld', self.smtp) - - sent_deferred = mail_sender.sendmail(input_mail) - - verify(reactor).connectTCP('localhost', 4650, any()) - - return self._succeed(sent_deferred) - - def test_senmail_returns_deffered(self): - when(reactor).connectTCP('localhost', 4650, any()).thenReturn(None) - input_mail = InputMail.from_dict(mail_dict()) - mail_sender = LocalSmtpMailSender('someone@somedomain.tld', self.smtp) - - deferred = mail_sender.sendmail(input_mail) - - self.assertIsNotNone(deferred) - self.assertTrue(isinstance(deferred, Deferred)) - - return self._succeed(deferred) - - def test_doesnt_send_mail_if_smtp_is_not_running(self): - self.smtp.ensure_running = lambda: False - mail_sender = LocalSmtpMailSender('someone@somedomain.tld', self.smtp) - - 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