From 19c899c1b143a4d1de09d6dad73e8b10e28ab037 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 4 Sep 2014 00:35:43 +0200 Subject: [PATCH] Issue #20957: test_smtpnet now uses support.transient_internet() to call check_ssl_verifiy(), so only test_connect_using_sslcontext_verified() is skipped if smtp.gmail.com cannot be joined, not the whole file. --- Lib/test/test_smtpnet.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_smtpnet.py b/Lib/test/test_smtpnet.py index 7f9db2ddf09..03bf93b8e7c 100644 --- a/Lib/test/test_smtpnet.py +++ b/Lib/test/test_smtpnet.py @@ -42,7 +42,6 @@ class SmtpTest(unittest.TestCase): class SmtpSSLTest(unittest.TestCase): testServer = 'smtp.gmail.com' remotePort = 465 - can_verify = check_ssl_verifiy(testServer, remotePort) def test_connect(self): support.get_attribute(smtplib, 'SMTP_SSL') @@ -66,8 +65,12 @@ class SmtpSSLTest(unittest.TestCase): server.ehlo() server.quit() - @unittest.skipUnless(can_verify, "SSL certificate can't be verified") def test_connect_using_sslcontext_verified(self): + with support.transient_internet(self.testServer): + can_verify = check_ssl_verifiy(self.testServer, self.remotePort) + if not can_verify: + self.skipTest("SSL certificate can't be verified") + support.get_attribute(smtplib, 'SMTP_SSL') context = ssl.create_default_context() with support.transient_internet(self.testServer):