From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 13 Oct 2010 17:20:54 +0000 (+0000)
Subject: Merged revisions 85423 via svnmerge from
X-Git-Tag: v2.7.1rc1~172
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e1ef1a11db94d9c66446ed002bd6c23888d2a2e;p=python

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 2108df5f94..f25343d27f 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):
         test_support.get_attribute(smtplib, 'SMTP_SSL')
-        server = smtplib.SMTP_SSL(self.testServer, self.remotePort)
+        with test_support.transient_internet(self.testServer):
+            server = smtplib.SMTP_SSL(self.testServer, self.remotePort)
         server.ehlo()
         server.quit()