[Python-checkins] r85425 - in python/branches/release27-maint: Lib/test/test_smtpnet.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Wed Oct 13 19:20:54 2010
New Revision: 85425

Log:
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
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/test/test_smtpnet.py

Modified: python/branches/release27-maint/Lib/test/test_smtpnet.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_smtpnet.py	(original)
+++ python/branches/release27-maint/Lib/test/test_smtpnet.py	Wed Oct 13 19:20:54 2010
@@ -12,7 +12,8 @@
 
     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()