Clean up the asyncio and sync client and server tests.

Author: aaugustin

tests/asyncio/test_client.py

@@ -75,7 +75,7 @@ async def test_existing_socket(self):
         """Client connects using a pre-existing socket."""
         async with serve(*args) as server:
             with socket.create_connection(get_host_port(server)) as sock:
-                # Use a non-existing domain to ensure we connect to sock.
+                # Use a non-existing domain to ensure we connect via sock.
                 async with connect("ws://invalid/", sock=sock) as client:
                     self.assertEqual(client.protocol.state.name, "OPEN")
 
@@ -341,7 +341,7 @@ def redirect(connection, request):
         async with serve(*args, process_request=redirect) as server:
             with socket.create_connection(get_host_port(server)) as sock:
                 with self.assertRaises(ValueError) as raised:
-                    # Use a non-existing domain to ensure we connect to sock.
+                    # Use a non-existing domain to ensure we connect via sock.
                     async with connect("ws://invalid/redirect", sock=sock):
                         self.fail("did not raise")
 
@@ -446,9 +446,11 @@ async def test_junk_handshake(self):
         """Client closes the connection when receiving non-HTTP response from server."""
 
         async def junk(reader, writer):
-            await asyncio.sleep(MS)  # wait for the client to send the handshake request
+            # Wait for the client to send the handshake request.
+            await asyncio.sleep(MS)
             writer.write(b"220 smtp.invalid ESMTP Postfix\r\n")
-            await reader.read(4096)  # wait for the client to close the connection
+            # Wait for the client to close the connection.
+            await reader.read(4096)
             writer.close()
 
         server = await asyncio.start_server(junk, "localhost", 0)
@@ -652,7 +654,7 @@ async def test_ignore_proxy_with_existing_socket(self):
         """Client connects using a pre-existing socket."""
         async with serve(*args) as server:
             with socket.create_connection(get_host_port(server)) as sock:
-                # Use a non-existing domain to ensure we connect to sock.
+                # Use a non-existing domain to ensure we connect via sock.
                 async with connect("ws://invalid/", sock=sock) as client:
                     self.assertEqual(client.protocol.state.name, "OPEN")
         self.assertNumFlows(0)

tests/asyncio/test_server.py

@@ -568,7 +568,7 @@ async def test_connection(self):
         async with serve(*args, ssl=SERVER_CONTEXT) as server:
             async with connect(get_uri(server), ssl=CLIENT_CONTEXT) as client:
                 await self.assertEval(client, "ws.protocol.state.name", "OPEN")
-                await self.assertEval(client, SSL_OBJECT + ".version()[:3]", "TLS")
+                await self.assertEval(client, f"{SSL_OBJECT}.version()[:3]", "TLS")
 
     async def test_timeout_during_tls_handshake(self):
         """Server times out before receiving TLS handshake request from client."""
@@ -604,7 +604,7 @@ async def test_connection(self):
             async with unix_serve(handler, path, ssl=SERVER_CONTEXT):
                 async with unix_connect(path, ssl=CLIENT_CONTEXT) as client:
                     await self.assertEval(client, "ws.protocol.state.name", "OPEN")
-                    await self.assertEval(client, SSL_OBJECT + ".version()[:3]", "TLS")
+                    await self.assertEval(client, f"{SSL_OBJECT}.version()[:3]", "TLS")
 
 
 class ServerUsageErrorsTests(unittest.IsolatedAsyncioTestCase):

tests/sync/test_client.py

@@ -44,7 +44,7 @@ def test_existing_socket(self):
         """Client connects using a pre-existing socket."""
         with run_server() as server:
             with socket.create_connection(server.socket.getsockname()) as sock:
-                # Use a non-existing domain to ensure we connect to sock.
+                # Use a non-existing domain to ensure we connect via sock.
                 with connect("ws://invalid/", sock=sock) as client:
                     self.assertEqual(client.protocol.state.name, "OPEN")
 
@@ -225,9 +225,11 @@ def test_junk_handshake(self):
 
         class JunkHandler(socketserver.BaseRequestHandler):
             def handle(self):
-                time.sleep(MS)  # wait for the client to send the handshake request
+                # Wait for the client to send the handshake request.
+                time.sleep(MS)
                 self.request.send(b"220 smtp.invalid ESMTP Postfix\r\n")
-                self.request.recv(4096)  # wait for the client to close the connection
+                # Wait for the client to close the connection.
+                self.request.recv(4096)
                 self.request.close()
 
         server = socketserver.TCPServer(("localhost", 0), JunkHandler)
@@ -401,7 +403,7 @@ def test_ignore_proxy_with_existing_socket(self):
         """Client connects using a pre-existing socket."""
         with run_server() as server:
             with socket.create_connection(server.socket.getsockname()) as sock:
-                # Use a non-existing domain to ensure we connect to sock.
+                # Use a non-existing domain to ensure we connect via sock.
                 with connect("ws://invalid/", sock=sock) as client:
                     self.assertEqual(client.protocol.state.name, "OPEN")
         self.assertNumFlows(0)
@@ -648,7 +650,7 @@ def test_proxy_ssl_without_https_proxy(self):
             connect(
                 "ws://localhost/",
                 proxy="http://localhost:8080",
-                proxy_ssl=True,
+                proxy_ssl=CLIENT_CONTEXT,
             )
         self.assertEqual(
             str(raised.exception),