Add more suggestions

Author: donbarbos

Doc/library/http.server.rst

@@ -56,7 +56,7 @@ handler.  Code to create and run the server looks like this::
                        password=None, alpn_protocols=None)
 
    Subclass of :class:`HTTPServer` with a wrapped socket using the :mod:`ssl` module.
-   If the :mod:`ssl` module is not available, instantiating an :class:`!HTTPSServer`
+   If the :mod:`ssl` module is not available, instantiating a :class:`!HTTPSServer`
    object fails with an :exc:`ImportError`.
 
    The *certfile* argument is the path to the SSL certificate chain file,
@@ -497,15 +497,15 @@ following command runs an HTTP/1.1 conformant server::
    Added the ``--protocol`` option.
 
 The server can also support TLS encryption. The options ``--tls-cert`` and
-``--tls-key`` allow specifying a TLS certificate chain and private key for
+``--tls-key`` allow specifying a TLS certificate chain and a private key for
 secure HTTPS connections. For example, the following command runs the server with
 TLS enabled:
 
 .. code-block:: bash
 
    python -m http.server --tls-cert fullchain.pem
 
-Use ``--tls-password-file`` option if private keys are password-protected:
+Use the ``--tls-password-file`` option if private keys are password-protected:
 
 .. code-block:: bash
 

Lib/test/test_httpservers.py

@@ -82,6 +82,8 @@ def stop(self):
 
 
 class BaseTestCase(unittest.TestCase):
+
+    # Optional tuple (certfile, keyfile, password) to use for HTTPS servers.
     tls = None
 
     def setUp(self):
@@ -335,10 +337,26 @@ def test_head_via_send_error(self):
 def certdata_file(*path):
     return os.path.join(os.path.dirname(__file__), "certdata", *path)
 
+class DummyRequestHandler(NoLogRequestHandler, SimpleHTTPRequestHandler):
+    pass
+
+def create_https_server(
+    certfile,
+    keyfile=None,
+    password=None,
+    *,
+    address=('localhost', 0),
+    request_handler=DummyRequestHandler,
+
+):
+    return HTTPSServer(
+        address, request_handler,
+        certfile=certfile, keyfile=keyfile, password=password
+    )
+
 
 @unittest.skipIf(ssl is None, "requires ssl")
 class BaseHTTPSServerTestCase(BaseTestCase):
-
     CERTFILE = certdata_file("keycert.pem")
     ONLYCERT = certdata_file("ssl_cert.pem")
     ONLYKEY = certdata_file("ssl_key.pem")
@@ -374,15 +392,10 @@ def test_valid_certdata(self):
             (self.ONLYCERT, self.ONLYKEY_PROTECTED, self.KEY_PASSWORD),
         ]
         for certfile, keyfile, password in valid_certdata:
-            server = HTTPSServer(
-                ('localhost', 0),
-                BaseHTTPRequestHandler,
-                certfile=certfile,
-                keyfile=keyfile,
-                password=password,
-            )
-            self.assertIsInstance(server, HTTPSServer)
-            server.server_close()
+            with self.subTest(certfile=certfile, keyfile=keyfile):
+                server = create_https_server(certfile, keyfile, password)
+                self.assertIsInstance(server, HTTPSServer)
+                server.server_close()
 
     def test_invalid_certdata(self):
         invalid_certdata = [
@@ -393,15 +406,10 @@ def test_invalid_certdata(self):
             (self.ONLYKEY, self.ONLYCERT, None),
             (self.CERTFILE_PROTECTED, None, self.BADPASSWORD),
         ]
-        for cerfile, keyfile, password in invalid_certdata:
-            with self.assertRaises(ssl.SSLError):
-                HTTPSServer(
-                    ('localhost', 0),
-                    self.request_handler,
-                    certfile=cerfile,
-                    keyfile=keyfile,
-                    password=password,
-                )
+        for certfile, keyfile, password in invalid_certdata:
+            with self.subTest(certfile=certfile, keyfile=keyfile):
+                with self.assertRaises(ssl.SSLError):
+                    create_https_server(certfile, keyfile, password)
 
 
 class RequestHandlerLoggingTestCase(BaseTestCase):