From: R. David Murray <rdmurray@bitdance.com>
Date: Sat, 23 May 2009 02:16:58 +0000 (+0000)
Subject: Don't be so wordy in requires('network') in case other tests
X-Git-Tag: v2.7a1~1125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=812e1c80c4f1b85ad8f9480986041c91f4915c59;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/test/test_smtpnet.py b/Lib/test/test_smtpnet.py
index c38eeeeeb2e1..73bc28a3fbb8 100644
--- a/Lib/test/test_smtpnet.py
+++ b/Lib/test/test_smtpnet.py
@@ -4,17 +4,14 @@ 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):
+        test_support.get_attribute(smtplib, 'SMTP_SSLX')
         server = smtplib.SMTP_SSL(self.testServer, self.remotePort)
         server.ehlo()
         server.quit()