Changeset 391 for python/trunk/Lib/test/test_smtpnet.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_smtpnet.py (modified) (1 diff)

python/trunk/Lib/test/test_smtpnet.py

@@ -12 +12 @@
 
     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)
+        test_support.get_attribute(smtplib, 'SMTP_SSL')
+        with test_support.transient_internet(self.testServer):
+            server = smtplib.SMTP_SSL(self.testServer, self.remotePort)
+        server.ehlo()
+        server.quit()
+
+    def test_connect_default_port(self):
+        test_support.get_attribute(smtplib, 'SMTP_SSL')
+        with test_support.transient_internet(self.testServer):
+            server = smtplib.SMTP_SSL(self.testServer)
         server.ehlo()
         server.quit()