Ticket #19134: 19134-with-test.diff

django/core/mail/backends/smtp.py

@@ -63 +63 @@
         try:
             try:
                 self.connection.quit()
-            except socket.sslerror:
+            except (socket.sslerror, smtplib.SMTPServerDisconnected):
                 # This happens when calling quit() on a TLS connection
-                # sometimes.
+                # sometimes, or when the connection was already disconnected
+                # by the server.
                 self.connection.close()
             except:
                 if self.fail_silently:

tests/regressiontests/mail/tests.py

@@ -678 +678 @@
 
     @classmethod
     def tearDownClass(cls):
+        # for Ticket #19134
+        backend = smtp.EmailBackend()
+        backend.username = None
+        backend.open()
         cls._settings_override.disable()
         cls.server.stop()
+        backend.close()
 
     def setUp(self):
         super(SMTPBackendTests, self).setUp()