From 262dbb10b81a38405409572eecb12ce5def35e5e Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Sat, 23 May 2009 02:30:55 +0000 Subject: [PATCH] Merged revisions 72838-72839 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72838 | r.david.murray | 2009-05-22 22:16:58 -0400 (Fri, 22 May 2009) | 3 lines Don't be so wordy in requires('network') in case other tests are added later, and skip the existing test if SSL is not available. ........ r72839 | r.david.murray | 2009-05-22 22:19:36 -0400 (Fri, 22 May 2009) | 2 lines Fix spelling left over from testing. ........ --- Lib/test/test_smtpnet.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_smtpnet.py b/Lib/test/test_smtpnet.py index c38eeeeeb2e..5b2e91adbdc 100644 --- a/Lib/test/test_smtpnet.py +++ b/Lib/test/test_smtpnet.py @@ -4,17 +4,15 @@ import unittest from test import test_support import smtplib -test_support.requires( - "network", - "use of network resource is not enabled and " - "test requires Internet access for communication with smtp.gmail.com:465", - ) +test_support.requires("network") class SmtpSSLTest(unittest.TestCase): testServer = 'smtp.gmail.com' remotePort = 465 def test_connect(self): + #Silently skip test if no SSL; in 2.7 we use SkipTest instead. + if not hasattr(smtplib, 'SMTP_SSL'): return server = smtplib.SMTP_SSL(self.testServer, self.remotePort) server.ehlo() server.quit()