Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Victor Stinner 2017-06-14 18:48:32 +02:00 committed by GitHub
parent 778b484145
commit b18563da88
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Lib/test/test_imaplib.py
View File

@ -12,7 +12,7 @@ import time
import calendar import calendar
from test.support import (reap_threads, verbose, transient_internet, 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 import unittest
from unittest import mock from unittest import mock
from datetime import datetime, timezone, timedelta from datetime import datetime, timezone, timedelta
@ -503,6 +503,15 @@ class NewIMAPSSLTests(NewIMAPTestsMixin, unittest.TestCase):
ssl_context=ssl_context) ssl_context=ssl_context)
client.shutdown() 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): class ThreadedNetworkedTests(unittest.TestCase):
server_class = socketserver.TCPServer server_class = socketserver.TCPServer
imap_class = imaplib.IMAP4 imap_class = imaplib.IMAP4
@ -965,25 +974,6 @@ class RemoteIMAP_SSLTest(RemoteIMAPTest):
_server = self.imap_class(self.host, self.port) _server = self.imap_class(self.host, self.port)
self.check_logincapa(_server) 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): def test_logout(self):
with transient_internet(self.host): with transient_internet(self.host):
_server = self.imap_class(self.host, self.port) _server = self.imap_class(self.host, self.port)