From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 18 May 2011 16:04:04 +0000 (+0200)
Subject: Also protect ehlo() and quit() with the transient_internet() context manager
X-Git-Tag: v3.3.0a1~2252
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc9ca223d62fdcf09f22d3cc8eb924cadba6d693;p=thirdparty%2FPython%2Fcpython.git

Also protect ehlo() and quit() with the transient_internet() context manager
---

diff --git a/Lib/test/test_smtpnet.py b/Lib/test/test_smtpnet.py
index ca31c1efb0a1..61ecd74f86ad 100644
--- a/Lib/test/test_smtpnet.py
+++ b/Lib/test/test_smtpnet.py
@@ -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():