From 4c084903fded399132ebe803b22f0f1a34df7f21 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 14 Jun 2017 18:48:32 +0200 Subject: [PATCH] bpo-30231: Remove skipped test_imaplib tests (#1419) The public cyrus.andrew.cmu.edu IMAP server (port 993) doesn't accept TLS connection using our self-signed x509 certificate. Remove the two tests which are already skipped. Write a new test_certfile_arg_warn() unit test for the certfile deprecation warning. (cherry picked from commit b18563da8803433509e9a0e29718e0271014659f) --- Lib/test/test_imaplib.py | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py index 9df37b1de58361..93ba61a1a99e5d 100644 --- a/Lib/test/test_imaplib.py +++ b/Lib/test/test_imaplib.py @@ -13,7 +13,7 @@ import inspect from test.support import (reap_threads, verbose, transient_internet, - run_with_tz, run_with_locale) + run_with_tz, run_with_locale, cpython_only) import unittest from unittest import mock from datetime import datetime, timezone, timedelta @@ -504,6 +504,15 @@ def test_ssl_verified(self): ssl_context=ssl_context) client.shutdown() + # Mock the private method _connect(), so mark the test as specific + # to CPython stdlib + @cpython_only + def test_certfile_arg_warn(self): + with support.check_warnings(('', DeprecationWarning)): + with mock.patch.object(self.imap_class, 'open'): + with mock.patch.object(self.imap_class, '_connect'): + self.imap_class('localhost', 143, certfile=CERTFILE) + class ThreadedNetworkedTests(unittest.TestCase): server_class = socketserver.TCPServer imap_class = imaplib.IMAP4 @@ -966,25 +975,6 @@ def test_logincapa(self): _server = self.imap_class(self.host, self.port) self.check_logincapa(_server) - @unittest.skipIf(True, - "bpo-30175: FIXME: cyrus.andrew.cmu.edu doesn't accept " - "our randomly generated client x509 certificate anymore") - def test_logincapa_with_client_certfile(self): - with transient_internet(self.host): - with support.check_warnings(('', DeprecationWarning)): - _server = self.imap_class(self.host, self.port, - certfile=CERTFILE) - self.check_logincapa(_server) - - @unittest.skipIf(True, - "bpo-30175: FIXME: cyrus.andrew.cmu.edu doesn't accept " - "our randomly generated client x509 certificate anymore") - def test_logincapa_with_client_ssl_context(self): - with transient_internet(self.host): - _server = self.imap_class( - self.host, self.port, ssl_context=self.create_ssl_context()) - self.check_logincapa(_server) - def test_logout(self): with transient_internet(self.host): _server = self.imap_class(self.host, self.port)