summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_smtpnet.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-13 17:19:55 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-13 17:19:55 (GMT)
commita0bf56d4f1e9ea9f47a7e18a29d7678df284e345 (patch)
treec10e72162d263969ef2374784bec527e2621c73a /Lib/test/test_smtpnet.py
parent674f40092aeaa38e2748fe7c1979b4710cbb5720 (diff)
downloadcpython-a0bf56d4f1e9ea9f47a7e18a29d7678df284e345.zip
cpython-a0bf56d4f1e9ea9f47a7e18a29d7678df284e345.tar.gz
cpython-a0bf56d4f1e9ea9f47a7e18a29d7678df284e345.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 ........
Diffstat (limited to 'Lib/test/test_smtpnet.py')
-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 5b1b38c0..6634df7 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()