bpo-30175: Skip client cert tests of test_imaplib (#1320) (#1323) · python/cpython@4dc3b9c (original) (raw)

2 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -966,13 +966,19 @@ def test_logincapa(self):
966 966 _server = self.imap_class(self.host, self.port)
967 967 self.check_logincapa(_server)
968 968
969 +@unittest.skipIf(True,
970 + "bpo-30175: FIXME: cyrus.andrew.cmu.edu doesn't accept "
971 + "our randomly generated client x509 certificate anymore")
969 972 def test_logincapa_with_client_certfile(self):
970 973 with transient_internet(self.host):
971 974 with support.check_warnings(('', DeprecationWarning)):
972 975 _server = self.imap_class(self.host, self.port,
973 976 certfile=CERTFILE)
974 977 self.check_logincapa(_server)
975 978
979 +@unittest.skipIf(True,
980 + "bpo-30175: FIXME: cyrus.andrew.cmu.edu doesn't accept "
981 + "our randomly generated client x509 certificate anymore")
976 982 def test_logincapa_with_client_ssl_context(self):
977 983 with transient_internet(self.host):
978 984 _server = self.imap_class(
Original file line number Diff line number Diff line change
@@ -286,7 +286,12 @@ class NetworkedNNTPTests(NetworkedNNTPTestsMixin, unittest.TestCase):
286 286 def setUpClass(cls):
287 287 support.requires("network")
288 288 with support.transient_internet(cls.NNTP_HOST):
289 -cls.server = cls.NNTP_CLASS(cls.NNTP_HOST, timeout=TIMEOUT, usenetrc=False)
289 +try:
290 +cls.server = cls.NNTP_CLASS(cls.NNTP_HOST, timeout=TIMEOUT,
291 +usenetrc=False)
292 +except EOFError:
293 +raise unittest.SkipTest(f"{cls} got EOF error on connecting "
294 +f"to {cls.NNTP_HOST!r}")
290 295
291 296 @classmethod
292 297 def tearDownClass(cls):