traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-30175: Skip client cert tests of test_imaplib (#1320) (#1323) 

* bpo-30175: Skip client cert tests of test_imaplib

The IMAP server cyrus.andrew.cmu.edu doesn't accept our randomly
generated client x509 certificate anymore.

* bpo-30188: Catch EOFError in NetworkedNNTPTests

test_nntplib fails randomly with EOFError in
NetworkedNNTPTests.setUpClass(). Catch EOFError to skip tests in that
case.

(cherry picked from commit 5bccca58b9)
This commit is contained in:
Victor Stinner 2017-04-27 18:25:03 +02:00 committed by GitHub
parent 33a5568f69
commit 4dc3b9cf2a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_imaplib.py
View File

@ -966,6 +966,9 @@ class RemoteIMAP_SSLTest(RemoteIMAPTest):
_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)):
@ -973,6 +976,9 @@ class RemoteIMAP_SSLTest(RemoteIMAPTest):
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(

7
Lib/test/test_nntplib.py
View File

@ -286,7 +286,12 @@ class NetworkedNNTPTests(NetworkedNNTPTestsMixin, unittest.TestCase):
def setUpClass(cls):
support.requires("network")
with support.transient_internet(cls.NNTP_HOST):
cls.server = cls.NNTP_CLASS(cls.NNTP_HOST, timeout=TIMEOUT, usenetrc=False)
try:
cls.server = cls.NNTP_CLASS(cls.NNTP_HOST, timeout=TIMEOUT,
usenetrc=False)
except EOFError:
raise unittest.SkipTest(f"{cls} got EOF error on connecting "
f"to {cls.NNTP_HOST!r}")
@classmethod
def tearDownClass(cls):