test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Undelete the `return True` removed in 4e0a2fe. 

This is quite important otherwise we don't close our connections to the
SMTP server.
This commit is contained in:
Marc Tamlyn 2014-01-12 23:33:48 +00:00
parent 89f12c0596
commit 9d2c5b0420
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/core/mail/backends/smtp.py
View File

@ -57,6 +57,7 @@ class EmailBackend(BaseEmailBackend):
self.connection.ehlo() self.connection.ehlo()
if self.username and self.password: if self.username and self.password:
self.connection.login(self.username, self.password) self.connection.login(self.username, self.password)
return True
except smtplib.SMTPException: except smtplib.SMTPException:
if not self.fail_silently: if not self.fail_silently:
raise raise

10
tests/mail/tests.py
View File

@ -894,6 +894,16 @@ class SMTPBackendTests(BaseEmailBackendTests, SimpleTestCase):
self.assertRaisesMessage(SMTPException, self.assertRaisesMessage(SMTPException,
'SMTP AUTH extension not supported by server.', backend.open) 'SMTP AUTH extension not supported by server.', backend.open)
def test_server_open(self):
"""
Test that open() tells us whether it opened a connection.
"""
backend = smtp.EmailBackend(username='', password='')
self.assertFalse(backend.connection)
opened = backend.open()
backend.close()
self.assertTrue(opened)
def test_server_stopped(self): def test_server_stopped(self):
""" """
Test that closing the backend while the SMTP server is stopped doesn't Test that closing the backend while the SMTP server is stopped doesn't