At least make tests non-error.testing-localhost

1 files changed, 22 insertions, 8 deletions

diff --git a/tests/test_nntplib.py b/tests/test_nntplib.py
index 07656fd..635e57e 100644
--- a/tests/test_nntplib.py
+++ b/tests/test_nntplib.py
@@ -9,6 +9,7 @@ import os.path
 import threading
 
 from test import support
+from test.support import socket_helper
 from nntplib import NNTP, GroupInfo
 from unittest.mock import patch
 try:
@@ -241,7 +242,7 @@ class NNTPv1Handler:
                     "\tSat, 19 Jun 2010 18:04:08 -0400"
                     "\t<4FD05F05-F98B-44DC-8111-C6009C925F0C@gmail.com>"
                     "\t<hvalf7$ort$1@dough.gmane.org>\t7103\t16"
-                    "\tXref: news.gmane.org gmane.comp.python.authors:57"
+                    "\tXref: news.gmane.io gmane.comp.python.authors:57"
                     "\n"
                 "58\tLooking for a few good bloggers"
                     "\tDoug Hellmann <doug.hellmann-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>"
@@ -424,7 +425,7 @@ class TcpServer(NNTPv2Handler):
     def __init__(self):
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM,
                                   socket.IPPROTO_TCP)
-        self.port = support.bind_port(self.sock)
+        self.port = socket_helper.bind_port(self.sock)
         self.sock.listen()
 
     def run_server(self):
@@ -494,9 +495,9 @@ class TcpServer(NNTPv2Handler):
     def handle_STARTTLS(self):
         self.reader.close()
         self.push_lit('382 Begin TLS negotiation now\r\n')
-        self.client = ssl.wrap_socket(self.client,
-                                      server_side=True,
-                                      certfile=certfile)
+        self.client = ssl.SSLContext.wrap_socket(self.client,
+                                                 server_side=True)
+        self.client.load_cert_chain(certfile=certfile)
         self.cleanup.enter_context(self.client)
         self.reader = self.cleanup.enter_context(self.client.makefile('rb'))
         self._readline = self.reader.readline
@@ -727,7 +728,7 @@ class NetworkedNNTPTestsMixin:
                 return False
             return True
 
-        with support.transient_internet(self.NNTP_HOST):
+        with socket_helper.transient_internet(self.NNTP_HOST):
             with self.NNTP_CLASS(self.NNTP_HOST,
                                  timeout=TIMEOUT, usenetrc=False) as server:
                 self.assertTrue(is_connected())
@@ -745,6 +746,7 @@ class NetworkedNNTPTests(NetworkedNNTPTestsMixin, unittest.TestCase):
     NNTP_HOST = 'news.trigofacile.com'
     GROUP_NAME = 'fr.comp.lang.python'
     GROUP_PAT = 'fr.comp.lang.*'
+    DESC = 'Python'
 
     NNTP_CLASS = NNTP
     SERVER_CLASS = TcpServer
@@ -754,7 +756,7 @@ class NetworkedNNTPTests(NetworkedNNTPTestsMixin, unittest.TestCase):
         server = cls.SERVER_CLASS()
         cls.background = threading.Thread(target=server.run_server)
         cls.background.start()
-        cls.server = cls.NNTP_CLASS(support.HOST, server.port,
+        cls.server = cls.NNTP_CLASS(socket_helper.HOST, server.port,
                                     timeout=TIMEOUT, usenetrc=False)
 
     @classmethod
@@ -840,6 +842,18 @@ def make_mock_file(handler):
     return (sio, file)
 
 
+class NNTPServer(nntplib.NNTP):
+
+    def __init__(self, f, host, readermode=None):
+        self.file = f
+        self.host = host
+        self._base_init(readermode)
+
+    def _close(self):
+        self.file.close()
+        del self.file
+
+
 class MockedNNTPTestsMixin:
     # Override in derived classes
     handler_class = None
@@ -855,7 +869,7 @@ class MockedNNTPTestsMixin:
     def make_server(self, *args, **kwargs):
         self.handler = self.handler_class()
         self.sio, file = make_mock_file(self.handler)
-        self.server = nntplib._NNTPBase(file, 'test.server', *args, **kwargs)
+        self.server = NNTPServer(file, 'test.server', *args, **kwargs)
         return self.server