gh-135056: Factor out a _make_server function from test function.

Author: aisipos

Lib/http/server.py

@@ -977,25 +977,34 @@ def _get_best_family(*address):
     return family, sockaddr
 
 
-def test(HandlerClass=BaseHTTPRequestHandler,
+def _make_server(HandlerClass=BaseHTTPRequestHandler,
          ServerClass=ThreadingHTTPServer,
          protocol="HTTP/1.0", port=8000, bind=None,
          tls_cert=None, tls_key=None, tls_password=None):
-    """Test the HTTP request handler class.
-
-    This runs an HTTP server on port 8000 (or the port argument).
-
-    """
     ServerClass.address_family, addr = _get_best_family(bind, port)
     HandlerClass.protocol_version = protocol
 
     if tls_cert:
-        server = ServerClass(addr, HandlerClass, certfile=tls_cert,
+        return ServerClass(addr, HandlerClass, certfile=tls_cert,
                              keyfile=tls_key, password=tls_password)
     else:
-        server = ServerClass(addr, HandlerClass)
+        return ServerClass(addr, HandlerClass)
+
+
+def test(HandlerClass=BaseHTTPRequestHandler,
+         ServerClass=ThreadingHTTPServer,
+         protocol="HTTP/1.0", port=8000, bind=None,
+         tls_cert=None, tls_key=None, tls_password=None):
+    """Test the HTTP request handler class.
+
+    This runs an HTTP server on port 8000 (or the port argument).
 
-    with server as httpd:
+    """
+    with _make_server(
+        HandlerClass=HandlerClass, ServerClass=ServerClass,
+        protocol=protocol, port=port, bind=bind, tls_cert=tls_cert,
+        tls_key=tls_key, tls_password=tls_password
+    ) as httpd:
         host, port = httpd.socket.getsockname()[:2]
         url_host = f'[{host}]' if ':' in host else host
         protocol = 'HTTPS' if tls_cert else 'HTTP'
@@ -1008,7 +1017,6 @@ def test(HandlerClass=BaseHTTPRequestHandler,
         except KeyboardInterrupt:
             print("\nKeyboard interrupt received, exiting.")
             sys.exit(0)
-    return server
 
 
 def _main(args=None):
@@ -1077,7 +1085,7 @@ class HTTPSDualStackServer(DualStackServerMixin, ThreadingHTTPSServer):
 
     ServerClass = HTTPSDualStackServer if args.tls_cert else HTTPDualStackServer
 
-    return test(
+    test(
         HandlerClass=SimpleHTTPRequestHandler,
         ServerClass=ServerClass,
         port=args.port,

Lib/test/test_httpservers.py

@@ -1489,25 +1489,33 @@ def test_unknown_flag(self, _):
         self.assertEqual(stdout.getvalue(), '')
         self.assertIn('error', stderr.getvalue())
 
-    def test_response_headers_arg(self):
-        with mock.patch.object(HTTPServer, 'serve_forever'):
-            httpd = server._main(
-                ['-H', 'Set-Cookie', 'k=v', '-H', 'Set-Cookie', 'k2=v2', '8080']
+    @mock.patch('http.server._make_server', wraps=server._make_server)
+    @mock.patch.object(HTTPServer, 'serve_forever')
+    def test_response_headers_arg(self, _, mock_make_server):
+        server._main(
+            ['-H', 'Set-Cookie', 'k=v', '-H', 'Set-Cookie', 'k2=v2', '8080']
+        )
+        # Get an instance of the server / RequestHandler by using
+        # the spied call args, then calling _make_server with them.
+        args, kwargs = mock_make_server.call_args
+        httpd = server._make_server(*args, **kwargs)
+
+        # Ensure the RequestHandler class is passed the correct response
+        # headers
+        request_handler_class = httpd.RequestHandlerClass
+        with mock.patch.object(
+            request_handler_class, '__init__'
+        ) as mock_handler_init:
+            mock_handler_init.return_value = None
+            # finish_request instantiates a request handler class,
+            # ensure response_headers are passed to it
+            httpd.finish_request(mock.Mock(), '127.0.0.1')
+            mock_handler_init.assert_called_once_with(
+                mock.ANY, mock.ANY, mock.ANY, directory=mock.ANY,
+                response_headers=[
+                    ['Set-Cookie', 'k=v'], ['Set-Cookie', 'k2=v2']
+                ]
             )
-            request_handler_class = httpd.RequestHandlerClass
-            with mock.patch.object(
-                    request_handler_class, '__init__'
-            ) as mock_handler_init:
-                mock_handler_init.return_value = None
-                # finish_request instantiates a request handler class,
-                # ensure response_headers are passed to it
-                httpd.finish_request(mock.Mock(), '127.0.0.1')
-                mock_handler_init.assert_called_once_with(
-                    mock.ANY, mock.ANY, mock.ANY, directory=mock.ANY,
-                    response_headers=[
-                        ['Set-Cookie', 'k=v'], ['Set-Cookie', 'k2=v2']
-                    ]
-                )
 
 
 class CommandLineRunTimeTestCase(unittest.TestCase):