]> granicus.if.org Git - python/commitdiff
Also protect ehlo() and quit() with the transient_internet() context manager
authorAntoine Pitrou <solipsis@pitrou.net>
Wed, 18 May 2011 16:04:04 +0000 (18:04 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Wed, 18 May 2011 16:04:04 +0000 (18:04 +0200)
Lib/test/test_smtpnet.py

index ca31c1efb0a10642bdd59e2064ec00cd871fc076..61ecd74f86add7bf9a7092d63e24e08d63076f50 100644 (file)
@@ -18,8 +18,8 @@ class SmtpTest(unittest.TestCase):
         with support.transient_internet(self.testServer):
             server = smtplib.SMTP(self.testServer, self.remotePort)
             server.starttls(context=self.context)
-        server.ehlo()
-        server.quit()
+            server.ehlo()
+            server.quit()
 
 
 class SmtpSSLTest(unittest.TestCase):
@@ -31,22 +31,22 @@ class SmtpSSLTest(unittest.TestCase):
         support.get_attribute(smtplib, 'SMTP_SSL')
         with support.transient_internet(self.testServer):
             server = smtplib.SMTP_SSL(self.testServer, self.remotePort)
-        server.ehlo()
-        server.quit()
+            server.ehlo()
+            server.quit()
 
     def test_connect_default_port(self):
         support.get_attribute(smtplib, 'SMTP_SSL')
         with support.transient_internet(self.testServer):
             server = smtplib.SMTP_SSL(self.testServer)
-        server.ehlo()
-        server.quit()
+            server.ehlo()
+            server.quit()
 
     def test_connect_using_sslcontext(self):
         support.get_attribute(smtplib, 'SMTP_SSL')
         with support.transient_internet(self.testServer):
             server = smtplib.SMTP_SSL(self.testServer, self.remotePort, context=self.context)
-        server.ehlo()
-        server.quit()
+            server.ehlo()
+            server.quit()
 
 
 def test_main():