summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-13 17:20:54 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-13 17:20:54 (GMT)
commit9e1ef1a11db94d9c66446ed002bd6c23888d2a2e (patch)
tree4909999b6fada55bf47dd1ac186c5fa3ec7d990b
parentbcb61956e34b18a00ac0ecdc8f268902af003ff7 (diff)
downloadcpython-9e1ef1a11db94d9c66446ed002bd6c23888d2a2e.zip
cpython-9e1ef1a11db94d9c66446ed002bd6c23888d2a2e.tar.gz
cpython-9e1ef1a11db94d9c66446ed002bd6c23888d2a2e.tar.bz2
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 ........
-rw-r--r--Lib/test/test_smtpnet.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_smtpnet.py b/Lib/test/test_smtpnet.py
index 2108df5..f25343d 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()