]> granicus.if.org Git - python/commitdiff
bpo-30188: test_nntplib catch also ssl.SSLEOFError (#2843)
authorVictor Stinner <victor.stinner@gmail.com>
Mon, 24 Jul 2017 15:41:02 +0000 (17:41 +0200)
committerGitHub <noreply@github.com>
Mon, 24 Jul 2017 15:41:02 +0000 (17:41 +0200)
Catch also ssl.SSLEOFError in NetworkedNNTPTests setUpClass().
EOFError was already catched.

Lib/test/test_nntplib.py

index 3e84f3429ee8546c8bbb9510e3a95b52052e0850..482de66e3f4782fa6b9c8a9208c7c7abf230654c 100644 (file)
@@ -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}")