From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 13 Oct 2010 17:19:55 +0000 (+0000)
Subject: Merged revisions 85423 via svnmerge from
X-Git-Tag: v3.1.3rc1~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0bf56d4f1e9ea9f47a7e18a29d7678df284e345;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 85423 via svnmerge from
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
........
---

diff --git a/Lib/test/test_smtpnet.py b/Lib/test/test_smtpnet.py
index 5b1b38c0f01a..6634df783bc5 100644
--- a/Lib/test/test_smtpnet.py
+++ b/Lib/test/test_smtpnet.py
@@ -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()