]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merged revisions 85423 via svnmerge from
authorAntoine Pitrou <solipsis@pitrou.net>
Wed, 13 Oct 2010 17:19:55 +0000 (17:19 +0000)
committerAntoine Pitrou <solipsis@pitrou.net>
Wed, 13 Oct 2010 17:19:55 +0000 (17:19 +0000)
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85423 | antoine.pitrou | 2010-10-13 19:14:16 +0200 (mer., 13 oct. 2010) | 3 lines

  Protect test_smtpnet against connection failures
........

Lib/test/test_smtpnet.py

index 5b1b38c0f01a5c6d61bcb17a3388cf1258ec67d6..6634df783bc59c0596c81e6a2b06592b7b0bc411 100644 (file)
@@ -12,7 +12,8 @@ class SmtpSSLTest(unittest.TestCase):
 
     def test_connect(self):
         support.get_attribute(smtplib, 'SMTP_SSL')
-        server = smtplib.SMTP_SSL(self.testServer, self.remotePort)
+        with support.transient_internet(self.testServer):
+            server = smtplib.SMTP_SSL(self.testServer, self.remotePort)
         server.ehlo()
         server.quit()