kallithea Changeset - 4f364ef689ab

Changeset - 4f364ef689ab

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Thomas De Schampheleire - 11 years ago 2015-08-15 21:41:03
thomas.de.schampheleire@gmail.com

email: fix double indentation in tests

1 file changed with 7 insertions and 7 deletions:

kallithea/tests/other/test_mail.py

0 comments (0 inline, 0 general)

kallithea/tests/other/test_mail.py

➞

Show inline comments

@@ @@ -10,82 +10,82 @@ class smtplib_mock(object): @@
         return smtplib_mock()
     def ehlo(self):
         pass
     def quit(self):
         pass
     def sendmail(self, sender, dest, msg):
         smtplib_mock.lastsender = sender
         smtplib_mock.lastdest = dest
         smtplib_mock.lastmsg = msg
         pass
 @mock.patch('kallithea.lib.rcmail.smtp_mailer.smtplib', smtplib_mock)
 class TestMail(BaseTestCase):
     def test_send_mail_trivial(self):
         mailserver = 'smtp.mailserver.org'
         recipients = ['rcpt1', 'rcpt2']
         envelope_from = 'noreply@mailserver.org'
         subject = 'subject'
         body = 'body'
         html_body = 'html_body'
         config_mock = {
                 'smtp_server': mailserver,
                 'app_email_from': envelope_from,
             'smtp_server': mailserver,
             'app_email_from': envelope_from,
+        }
         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(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,
             '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)
     def test_send_mail_no_recipients_no_email_to(self):
         mailserver = 'smtp.mailserver.org'
         recipients = []
         envelope_from = 'noreply@mailserver.org'
         subject = 'subject'
         body = 'body'
         html_body = 'html_body'
         config_mock = {
                 'smtp_server': mailserver,
                 'app_email_from': envelope_from,
             'smtp_server': mailserver,
             'app_email_from': envelope_from,
+        }
         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]))
         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)