summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-05-23 02:36:15 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-05-23 02:36:15 (GMT)
commiteccb2ce3c03b2cbf9ce84e4c994441f1eab12ba2 (patch)
treefa988f568201e32bc86f41f65d100ae64e385870 /Lib
parent87e2074ecb1394d7a123151432813bf608247f9c (diff)
downloadcpython-eccb2ce3c03b2cbf9ce84e4c994441f1eab12ba2.zip
cpython-eccb2ce3c03b2cbf9ce84e4c994441f1eab12ba2.tar.gz
cpython-eccb2ce3c03b2cbf9ce84e4c994441f1eab12ba2.tar.bz2
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. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_smtpnet.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/Lib/test/test_smtpnet.py b/Lib/test/test_smtpnet.py
index 5ca4195..5b1b38c0 100644
--- a/Lib/test/test_smtpnet.py
+++ b/Lib/test/test_smtpnet.py
@@ -4,17 +4,14 @@ import unittest
from test import support
import smtplib
-support.requires(
- "network",
- "use of network resource is not enabled and "
- "test requires Internet access for communication with smtp.gmail.com:465",
- )
+support.requires("network")
class SmtpSSLTest(unittest.TestCase):
testServer = 'smtp.gmail.com'
remotePort = 465
def test_connect(self):
+ support.get_attribute(smtplib, 'SMTP_SSL')
server = smtplib.SMTP_SSL(self.testServer, self.remotePort)
server.ehlo()
server.quit()