diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-04-27 15:30:13 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-27 15:30:13 (GMT) |
| commit | 5bccca58b9b2b3a925b16750bedbd907695ea8d7 (patch) | |
| tree | 5808d758801ae24109ccd9ccc2aca1ec5bc29956 | |
| parent | e65fcde85abf6617508f2d6b77020e24b8ca6f6b (diff) | |
| download | cpython-5bccca58b9b2b3a925b16750bedbd907695ea8d7.zip cpython-5bccca58b9b2b3a925b16750bedbd907695ea8d7.tar.gz cpython-5bccca58b9b2b3a925b16750bedbd907695ea8d7.tar.bz2 | |
bpo-30175: Skip client cert tests of test_imaplib (#1320)
* 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.
| -rw-r--r-- | Lib/test/test_imaplib.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_nntplib.py | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py index 5ef9512..a33fb71 100644 --- a/Lib/test/test_imaplib.py +++ b/Lib/test/test_imaplib.py @@ -965,6 +965,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)): @@ -972,6 +975,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( diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py index c46ded1..3e84f34 100644 --- a/Lib/test/test_nntplib.py +++ b/Lib/test/test_nntplib.py @@ -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): |