Chore bump websockets to 13.x (#532)

Author: leszekhanusz

setup.py

@@ -52,7 +52,7 @@
 ]
 
 install_websockets_requires = [
-    "websockets>=10,<12",
+    "websockets>=10.1,<14",
 ]
 
 install_botocore_requires = [

tests/conftest.py

@@ -501,7 +501,7 @@ def get_server_handler(request):
     else:
         answers = request.param
 
-        async def default_server_handler(ws, path):
+        async def default_server_handler(ws):
 
             try:
                 await WebSocketServerHelper.send_connection_ack(ws)

tests/test_aiohttp_websocket_exceptions.py

@@ -70,7 +70,7 @@ async def test_aiohttp_websocket_invalid_query(
 """
 
 
-async def server_invalid_subscription(ws, path):
+async def server_invalid_subscription(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
     await ws.recv()
     await ws.send(invalid_query1_server_answer.format(query_id=1))
@@ -108,7 +108,7 @@ async def test_aiohttp_websocket_invalid_subscription(
 )
 
 
-async def server_no_ack(ws, path):
+async def server_no_ack(ws):
     await ws.wait_closed()
 
 
@@ -129,7 +129,7 @@ async def test_aiohttp_websocket_server_does_not_send_ack(
             pass
 
 
-async def server_connection_error(ws, path):
+async def server_connection_error(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
     result = await ws.recv()
     print(f"Server received: {result}")
@@ -158,7 +158,7 @@ async def test_aiohttp_websocket_sending_invalid_data(
 )
 
 
-async def server_invalid_payload(ws, path):
+async def server_invalid_payload(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
     result = await ws.recv()
     print(f"Server received: {result}")
@@ -253,7 +253,7 @@ async def test_aiohttp_websocket_transport_protocol_errors(
         await session.execute(query)
 
 
-async def server_without_ack(ws, path):
+async def server_without_ack(ws):
     # Sending something else than an ack
     await WebSocketServerHelper.send_complete(ws, 1)
     await ws.wait_closed()
@@ -274,7 +274,7 @@ async def test_aiohttp_websocket_server_does_not_ack(event_loop, server):
             pass
 
 
-async def server_closing_directly(ws, path):
+async def server_closing_directly(ws):
     await ws.close()
 
 
@@ -294,7 +294,7 @@ async def test_aiohttp_websocket_server_closing_directly(event_loop, server):
             pass
 
 
-async def server_closing_after_ack(ws, path):
+async def server_closing_after_ack(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
     await ws.close()
 
@@ -313,7 +313,7 @@ async def test_aiohttp_websocket_server_closing_after_ack(
         await session.execute(query)
 
 
-async def server_sending_invalid_query_errors(ws, path):
+async def server_sending_invalid_query_errors(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
     invalid_error = (
         '{"type":"error","id":"404","payload":'

tests/test_aiohttp_websocket_graphqlws_exceptions.py

@@ -68,7 +68,7 @@ async def test_aiohttp_websocket_graphqlws_invalid_query(
 """
 
 
-async def server_invalid_subscription(ws, path):
+async def server_invalid_subscription(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
     await ws.recv()
     await ws.send(invalid_query1_server_answer.format(query_id=1))
@@ -102,7 +102,7 @@ async def test_aiohttp_websocket_graphqlws_invalid_subscription(
     assert error["extensions"]["code"] == "INTERNAL_SERVER_ERROR"
 
 
-async def server_no_ack(ws, path):
+async def server_no_ack(ws):
     await ws.wait_closed()
 
 
@@ -130,7 +130,7 @@ async def test_aiohttp_websocket_graphqlws_server_does_not_send_ack(
 )
 
 
-async def server_invalid_query(ws, path):
+async def server_invalid_query(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
     result = await ws.recv()
     print(f"Server received: {result}")
@@ -207,7 +207,7 @@ async def test_aiohttp_websocket_graphqlws_transport_protocol_errors(
         await session.execute(query)
 
 
-async def server_without_ack(ws, path):
+async def server_without_ack(ws):
     # Sending something else than an ack
     await WebSocketServerHelper.send_complete(ws, 1)
     await ws.wait_closed()
@@ -230,7 +230,7 @@ async def test_aiohttp_websocket_graphqlws_server_does_not_ack(
             pass
 
 
-async def server_closing_directly(ws, path):
+async def server_closing_directly(ws):
     await ws.close()
 
 
@@ -252,7 +252,7 @@ async def test_aiohttp_websocket_graphqlws_server_closing_directly(
             pass
 
 
-async def server_closing_after_ack(ws, path):
+async def server_closing_after_ack(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
     await ws.close()
 

tests/test_aiohttp_websocket_graphqlws_subscription.py

@@ -30,7 +30,7 @@
 def server_countdown_factory(
     keepalive=False, answer_pings=True, simulate_disconnect=False
 ):
-    async def server_countdown_template(ws, path):
+    async def server_countdown_template(ws):
         import websockets
 
         logged_messages.clear()
@@ -192,28 +192,28 @@ async def receiving_coro():
     return server_countdown_template
 
 
-async def server_countdown(ws, path):
+async def server_countdown(ws):
 
     server = server_countdown_factory()
-    await server(ws, path)
+    await server(ws)
 
 
-async def server_countdown_keepalive(ws, path):
+async def server_countdown_keepalive(ws):
 
     server = server_countdown_factory(keepalive=True)
-    await server(ws, path)
+    await server(ws)
 
 
-async def server_countdown_dont_answer_pings(ws, path):
+async def server_countdown_dont_answer_pings(ws):
 
     server = server_countdown_factory(answer_pings=False)
-    await server(ws, path)
+    await server(ws)
 
 
-async def server_countdown_disconnect(ws, path):
+async def server_countdown_disconnect(ws):
 
     server = server_countdown_factory(simulate_disconnect=True)
-    await server(ws, path)
+    await server(ws)
 
 
 countdown_subscription_str = """
@@ -353,7 +353,7 @@ async def close_transport_task_coro():
     assert count > 0
 
 
-async def server_countdown_close_connection_in_middle(ws, path):
+async def server_countdown_close_connection_in_middle(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
 
     result = await ws.recv()

tests/test_aiohttp_websocket_query.py

@@ -228,7 +228,7 @@ async def test_aiohttp_websocket_two_queries_in_series(
     assert result1 == result2
 
 
-async def server1_two_queries_in_parallel(ws, path):
+async def server1_two_queries_in_parallel(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
     result = await ws.recv()
     print(f"Server received: {result}", file=sys.stderr)
@@ -276,7 +276,7 @@ async def task2_coro():
     assert result1 == result2
 
 
-async def server_closing_while_we_are_doing_something_else(ws, path):
+async def server_closing_while_we_are_doing_something_else(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
     result = await ws.recv()
     print(f"Server received: {result}", file=sys.stderr)
@@ -434,7 +434,7 @@ async def test_aiohttp_websocket_trying_to_connect_to_already_connected_transpor
                 pass
 
 
-async def server_with_authentication_in_connection_init_payload(ws, path):
+async def server_with_authentication_in_connection_init_payload(ws):
     # Wait the connection_init message
     init_message_str = await ws.recv()
     init_message = json.loads(init_message_str)
@@ -593,7 +593,7 @@ async def test_aiohttp_websocket_add_extra_parameters_to_connect(
         await session.execute(query)
 
 
-async def server_sending_keep_alive_before_connection_ack(ws, path):
+async def server_sending_keep_alive_before_connection_ack(ws):
     await WebSocketServerHelper.send_keepalive(ws)
     await WebSocketServerHelper.send_keepalive(ws)
     await WebSocketServerHelper.send_keepalive(ws)

tests/test_aiohttp_websocket_subscription.py

@@ -30,7 +30,7 @@
 }
 
 
-async def server_starwars(ws, path):
+async def server_starwars(ws):
     import websockets
 
     await WebSocketServerHelper.send_connection_ack(ws)
@@ -91,7 +91,7 @@ async def server_starwars(ws, path):
 logged_messages: List[str] = []
 
 
-async def server_countdown(ws, path):
+async def server_countdown(ws):
     import websockets
 
     logged_messages.clear()
@@ -343,7 +343,7 @@ async def close_transport_task_coro():
     assert count > 0
 
 
-async def server_countdown_close_connection_in_middle(ws, path):
+async def server_countdown_close_connection_in_middle(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
 
     result = await ws.recv()

tests/test_appsync_websockets.py

@@ -107,7 +107,7 @@ def verify_headers(headers, in_query=False):
             "errorCode": 400,
         }
 
-    async def realtime_appsync_server_template(ws, path):
+    async def realtime_appsync_server_template(ws):
         import websockets
 
         logged_messages.clear()
@@ -139,6 +139,8 @@ async def realtime_appsync_server_template(ws, path):
                 )
                 return
 
+            path = ws.path
+
             print(f"path = {path}")
 
             path_base, parameters_str = path.split("?")
@@ -348,28 +350,28 @@ async def receiving_coro():
     return realtime_appsync_server_template
 
 
-async def realtime_appsync_server(ws, path):
+async def realtime_appsync_server(ws):
 
     server = realtime_appsync_server_factory()
-    await server(ws, path)
+    await server(ws)
 
 
-async def realtime_appsync_server_keepalive(ws, path):
+async def realtime_appsync_server_keepalive(ws):
 
     server = realtime_appsync_server_factory(keepalive=True)
-    await server(ws, path)
+    await server(ws)
 
 
-async def realtime_appsync_server_not_json_answer(ws, path):
+async def realtime_appsync_server_not_json_answer(ws):
 
     server = realtime_appsync_server_factory(not_json_answer=True)
-    await server(ws, path)
+    await server(ws)
 
 
-async def realtime_appsync_server_error_without_id(ws, path):
+async def realtime_appsync_server_error_without_id(ws):
 
     server = realtime_appsync_server_factory(error_without_id=True)
-    await server(ws, path)
+    await server(ws)
 
 
 on_create_message_subscription_str = """

tests/test_async_client_validation.py

@@ -22,7 +22,7 @@
 }
 
 
-async def server_starwars(ws, path):
+async def server_starwars(ws):
     import websockets
 
     await WebSocketServerHelper.send_connection_ack(ws)

tests/test_graphqlws_exceptions.py

@@ -68,7 +68,7 @@ async def test_graphqlws_invalid_query(
 """
 
 
-async def server_invalid_subscription(ws, path):
+async def server_invalid_subscription(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
     await ws.recv()
     await ws.send(invalid_query1_server_answer.format(query_id=1))
@@ -102,7 +102,7 @@ async def test_graphqlws_invalid_subscription(
     assert error["extensions"]["code"] == "INTERNAL_SERVER_ERROR"
 
 
-async def server_no_ack(ws, path):
+async def server_no_ack(ws):
     await ws.wait_closed()
 
 
@@ -130,7 +130,7 @@ async def test_graphqlws_server_does_not_send_ack(
 )
 
 
-async def server_invalid_query(ws, path):
+async def server_invalid_query(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
     result = await ws.recv()
     print(f"Server received: {result}")
@@ -205,7 +205,7 @@ async def test_graphqlws_transport_protocol_errors(
         await session.execute(query)
 
 
-async def server_without_ack(ws, path):
+async def server_without_ack(ws):
     # Sending something else than an ack
     await WebSocketServerHelper.send_complete(ws, 1)
     await ws.wait_closed()
@@ -226,7 +226,7 @@ async def test_graphqlws_server_does_not_ack(event_loop, graphqlws_server):
             pass
 
 
-async def server_closing_directly(ws, path):
+async def server_closing_directly(ws):
     await ws.close()
 
 
@@ -246,7 +246,7 @@ async def test_graphqlws_server_closing_directly(event_loop, graphqlws_server):
             pass
 
 
-async def server_closing_after_ack(ws, path):
+async def server_closing_after_ack(ws):
     await WebSocketServerHelper.send_connection_ack(ws)
     await ws.close()