kallithea Changeset - 1339fd56f302

Changeset - 1339fd56f302

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Thomas De Schampheleire - 10 years ago 2015-08-02 21:17:14
thomas.de.schampheleire@gmail.com

e-mail: revive dead code that checks for unspecified recipients

Commit 609e06b6c52f6a8ea9581372805c4bbb60db81a1 introduced dead code:
in the beginning of send_email an assert verifies that recipients is of type
'list', so checking it for None later is useless and that branch can never
be reached.

Instead of removing the dead code, revive it and add a test case.

2 files changed with 28 insertions and 5 deletions:

kallithea/lib/celerylib/tasks.py

kallithea/tests/other/test_mail.py

0 comments (0 inline, 0 general)

kallithea/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -261,21 +261,20 @@ def send_email(recipients, subject, body @@
     assert isinstance(recipients, list), recipients
     email_config = config
     email_prefix = email_config.get('email_prefix', '')
     if email_prefix:
         subject = "%s %s" % (email_prefix, subject)
     if recipients is None:
     if not recipients:
         # if recipients are not defined we send to email_config + all admins
         admins = [u.email for u in User.query()
                   .filter(User.admin == True).all()]
         recipients = [email_config.get('email_to')] + admins
         log.warning("recipients not specified for '%s' - sending to admins %s", subject, ' '.join(recipients))
     elif not recipients:
         log.error("No recipients specified")
         return False
         log.warning("No recipients specified for '%s' - sending to admins %s", subject, ' '.join(recipients))
     mail_from = email_config.get('app_email_from', 'Kallithea')
     user = email_config.get('smtp_username')
     passwd = email_config.get('smtp_password')
     mail_server = email_config.get('smtp_server')
     mail_port = email_config.get('smtp_port')

kallithea/tests/other/test_mail.py

➞

Show inline comments

@@ @@ -41,6 +41,30 @@ class TestMail(BaseTestCase): @@
         self.assertSetEqual(smtplib_mock.lastdest, set(recipients))
         self.assertEqual(smtplib_mock.lastsender, envelope_from)
         self.assertIn('From: %s' % envelope_from, smtplib_mock.lastmsg)
         self.assertIn('Subject: %s' % subject, smtplib_mock.lastmsg)
         self.assertIn(body, smtplib_mock.lastmsg)
         self.assertIn(html_body, smtplib_mock.lastmsg)
     def test_send_mail_no_recipients(self):
         mailserver = 'smtp.mailserver.org'
         recipients = []
         envelope_from = 'noreply@mailserver.org'
         email_to = 'admin@mailserver.org'
         subject = 'subject'
         body = 'body'
         html_body = 'html_body'
         config_mock = {
                 'smtp_server': mailserver,
                 'app_email_from': envelope_from,
                 'email_to': email_to,
+        }
         with mock.patch('kallithea.lib.celerylib.tasks.config', config_mock):
             kallithea.lib.celerylib.tasks.send_email(recipients, subject, body, html_body)
         self.assertSetEqual(smtplib_mock.lastdest, set([TEST_USER_ADMIN_EMAIL, email_to]))
         self.assertEqual(smtplib_mock.lastsender, envelope_from)
         self.assertIn('From: %s' % envelope_from, smtplib_mock.lastmsg)
         self.assertIn('Subject: %s' % subject, smtplib_mock.lastmsg)
         self.assertIn(body, smtplib_mock.lastmsg)
         self.assertIn(html_body, smtplib_mock.lastmsg)

0 comments (0 inline, 0 general)