commit 4dc3b9cf2a868a8378ecbc2221a15e7b59e8e944
author Victor Stinner <victor.stinner@gmail.com> Thu Apr 27 18:25:03 2017 +0200
committer GitHub <noreply@github.com> Thu Apr 27 18:25:03 2017 +0200
tree bd36efa93d2cf43a841e2c20d512c9bc48968c95
parent 33a5568f69301562d536852d12b9e03cd8dfc3a4

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 5bccca58b9b2b3a925b16750bedbd907695ea8d7)

Lib/test/test_nntplib.py

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 @@
     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):