summaryrefslogtreecommitdiff
path: root/tests/mail
diff options
context:
space:
mode:
authorJosé Padilla <jpadilla@webapplicate.com>2014-09-12 22:46:22 -0400
committerTim Graham <timograham@gmail.com>2014-09-13 09:33:21 -0400
commit5472d18e3193050f5b9a25b71852ca7b77f852a5 (patch)
treeb65e10a3ab0c5ee90fe0a5989050cbb21672c437 /tests/mail
parent0ae79014c09f4ddd2575f53371d994773d0bd43c (diff)
downloaddjango-5472d18e3193050f5b9a25b71852ca7b77f852a5.tar.gz
Fixed #23461 -- Added EMAIL_TIMEOUT setting
Diffstat (limited to 'tests/mail')
-rw-r--r--tests/mail/tests.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/mail/tests.py b/tests/mail/tests.py
index cc5e3d8197..df6daee5c8 100644
--- a/tests/mail/tests.py
+++ b/tests/mail/tests.py
@@ -1033,3 +1033,8 @@ class SMTPBackendTests(BaseEmailBackendTests, SimpleTestCase):
self.assertEqual(myemailbackend.timeout, 42)
self.assertEqual(myemailbackend.connection.timeout, 42)
myemailbackend.close()
+
+ @override_settings(EMAIL_TIMEOUT=10)
+ def test_email_timeout_override_settings(self):
+ backend = smtp.EmailBackend()
+ self.assertEqual(backend.timeout, 10)