From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 24 Jul 2017 15:41:02 +0000 (+0200)
Subject: bpo-30188: test_nntplib catch also ssl.SSLEOFError (#2843)
X-Git-Tag: v3.7.0a1~379
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b4feb7e86ecb813b2c56560f86cda2fd46b9579;p=python

bpo-30188: test_nntplib catch also ssl.SSLEOFError (#2843)

Catch also ssl.SSLEOFError in NetworkedNNTPTests setUpClass().
EOFError was already catched.
---

diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index 3e84f3429e..482de66e3f 100644
--- a/Lib/test/test_nntplib.py
+++ b/Lib/test/test_nntplib.py
@@ -274,6 +274,11 @@ class NetworkedNNTPTestsMixin:
 NetworkedNNTPTestsMixin.wrap_methods()
 
 
+EOF_ERRORS = [EOFError]
+if ssl is not None:
+    EOF_ERRORS.append(ssl.SSLEOFError)
+
+
 class NetworkedNNTPTests(NetworkedNNTPTestsMixin, unittest.TestCase):
     # This server supports STARTTLS (gmane doesn't)
     NNTP_HOST = 'news.trigofacile.com'
@@ -289,7 +294,7 @@ class NetworkedNNTPTests(NetworkedNNTPTestsMixin, unittest.TestCase):
             try:
                 cls.server = cls.NNTP_CLASS(cls.NNTP_HOST, timeout=TIMEOUT,
                                             usenetrc=False)
-            except EOFError:
+            except EOF_ERRORS:
                 raise unittest.SkipTest(f"{cls} got EOF error on connecting "
                                         f"to {cls.NNTP_HOST!r}")