Rename TestServer for clarity and to not confuse pytest

The old name could be mistaken for a test class,
pytests skipped it only because it had an __init__ method.

Author: Cito

tests/conftest.py

@@ -74,9 +74,8 @@ async def go(app, *, port=None, **kwargs):  # type: ignore
 MS = 0.001 * int(os.environ.get("GQL_TESTS_TIMEOUT_FACTOR", 1))
 
 
-class TestServer:
-    """
-    Class used to generate a websocket server on localhost on a free port
+class WebSocketServer:
+    """Websocket server on localhost on a free port.
 
     Will allow us to test our client by simulating different correct and incorrect server responses
     """
@@ -179,7 +178,7 @@ def get_server_handler(request):
         async def default_server_handler(ws, path):
 
             try:
-                await TestServer.send_connection_ack(ws)
+                await WebSocketServer.send_connection_ack(ws)
                 query_id = 1
 
                 for answer in answers:
@@ -193,10 +192,10 @@ async def default_server_handler(ws, path):
                         formatted_answer = answer
 
                     await ws.send(formatted_answer)
-                    await TestServer.send_complete(ws, query_id)
+                    await WebSocketServer.send_complete(ws, query_id)
                     query_id += 1
 
-                await TestServer.wait_connection_terminate(ws)
+                await WebSocketServer.wait_connection_terminate(ws)
                 await ws.wait_closed()
             except ConnectionClosed:
                 pass
@@ -217,7 +216,7 @@ async def ws_ssl_server(request):
     server_handler = get_server_handler(request)
 
     try:
-        test_server = TestServer(with_ssl=True)
+        test_server = WebSocketServer(with_ssl=True)
 
         # Starting the server with the fixture param as the handler function
         await test_server.start(server_handler)
@@ -240,7 +239,7 @@ async def server(request):
     server_handler = get_server_handler(request)
 
     try:
-        test_server = TestServer()
+        test_server = WebSocketServer()
 
         # Starting the server with the fixture param as the handler function
         await test_server.start(server_handler)

tests/test_async_client_validation.py

@@ -8,7 +8,7 @@
 from gql import Client, gql
 from gql.transport.websockets import WebsocketsTransport
 
-from .conftest import MS, TestServer
+from .conftest import MS, WebSocketServer
 from .starwars.schema import StarWarsIntrospection, StarWarsSchema, StarWarsTypeDef
 
 starwars_expected_one = {
@@ -25,7 +25,7 @@
 
 
 async def server_starwars(ws, path):
-    await TestServer.send_connection_ack(ws)
+    await WebSocketServer.send_connection_ack(ws)
 
     try:
         await ws.recv()
@@ -40,8 +40,8 @@ async def server_starwars(ws, path):
             await ws.send(data)
             await asyncio.sleep(2 * MS)
 
-        await TestServer.send_complete(ws, 1)
-        await TestServer.wait_connection_terminate(ws)
+        await WebSocketServer.send_complete(ws, 1)
+        await WebSocketServer.wait_connection_terminate(ws)
 
     except websockets.exceptions.ConnectionClosedOK:
         pass

tests/test_websocket_exceptions.py

@@ -13,7 +13,7 @@
 )
 from gql.transport.websockets import WebsocketsTransport
 
-from .conftest import MS, TestServer
+from .conftest import MS, WebSocketServer
 
 invalid_query_str = """
     query getContinents {
@@ -59,10 +59,10 @@ async def test_websocket_invalid_query(event_loop, client_and_server, query_str)
 
 
 async def server_invalid_subscription(ws, path):
-    await TestServer.send_connection_ack(ws)
+    await WebSocketServer.send_connection_ack(ws)
     await ws.recv()
     await ws.send(invalid_query1_server_answer.format(query_id=1))
-    await TestServer.send_complete(ws, 1)
+    await WebSocketServer.send_complete(ws, 1)
     await ws.wait_closed()
 
 
@@ -105,7 +105,7 @@ async def test_websocket_server_does_not_send_ack(event_loop, server, query_str)
 
 
 async def server_connection_error(ws, path):
-    await TestServer.send_connection_ack(ws)
+    await WebSocketServer.send_connection_ack(ws)
     result = await ws.recv()
     print(f"Server received: {result}")
     await ws.send(connection_error_server_answer)
@@ -132,11 +132,11 @@ async def test_websocket_sending_invalid_data(event_loop, client_and_server, que
 
 
 async def server_invalid_payload(ws, path):
-    await TestServer.send_connection_ack(ws)
+    await WebSocketServer.send_connection_ack(ws)
     result = await ws.recv()
     print(f"Server received: {result}")
     await ws.send(invalid_payload_server_answer)
-    await TestServer.wait_connection_terminate(ws)
+    await WebSocketServer.wait_connection_terminate(ws)
     await ws.wait_closed()
 
 
@@ -215,7 +215,7 @@ async def test_websocket_transport_protocol_errors(event_loop, client_and_server
 
 async def server_without_ack(ws, path):
     # Sending something else than an ack
-    await TestServer.send_keepalive(ws)
+    await WebSocketServer.send_keepalive(ws)
     await ws.wait_closed()
 
 
@@ -252,7 +252,7 @@ async def test_websocket_server_closing_directly(event_loop, server):
 
 
 async def server_closing_after_ack(ws, path):
-    await TestServer.send_connection_ack(ws)
+    await WebSocketServer.send_connection_ack(ws)
     await ws.close()
 
 
@@ -274,7 +274,7 @@ async def test_websocket_server_closing_after_ack(event_loop, client_and_server)
 
 
 async def server_sending_invalid_query_errors(ws, path):
-    await TestServer.send_connection_ack(ws)
+    await WebSocketServer.send_connection_ack(ws)
     invalid_error = '{"type":"error","id":"404","payload":{"message":"error for no good reason on non existing query"}}'
     await ws.send(invalid_error)
     await ws.wait_closed()

tests/test_websocket_query.py

@@ -15,7 +15,7 @@
 )
 from gql.transport.websockets import WebsocketsTransport
 
-from .conftest import MS, TestServer
+from .conftest import MS, WebSocketServer
 
 query1_str = """
     query getContinents {
@@ -152,16 +152,16 @@ async def test_websocket_two_queries_in_series(
 
 
 async def server1_two_queries_in_parallel(ws, path):
-    await TestServer.send_connection_ack(ws)
+    await WebSocketServer.send_connection_ack(ws)
     result = await ws.recv()
     print(f"Server received: {result}")
     result = await ws.recv()
     print(f"Server received: {result}")
     await ws.send(query1_server_answer.format(query_id=1))
     await ws.send(query1_server_answer.format(query_id=2))
-    await TestServer.send_complete(ws, 1)
-    await TestServer.send_complete(ws, 2)
-    await TestServer.wait_connection_terminate(ws)
+    await WebSocketServer.send_complete(ws, 1)
+    await WebSocketServer.send_complete(ws, 2)
+    await WebSocketServer.wait_connection_terminate(ws)
     await ws.wait_closed()
 
 
@@ -199,11 +199,11 @@ async def task2_coro():
 
 
 async def server_closing_while_we_are_doing_something_else(ws, path):
-    await TestServer.send_connection_ack(ws)
+    await WebSocketServer.send_connection_ack(ws)
     result = await ws.recv()
     print(f"Server received: {result}")
     await ws.send(query1_server_answer.format(query_id=1))
-    await TestServer.send_complete(ws, 1)
+    await WebSocketServer.send_complete(ws, 1)
     await asyncio.sleep(1 * MS)
 
     # Closing server after first query
@@ -349,7 +349,7 @@ async def server_with_authentication_in_connection_init_payload(ws, path):
             result = await ws.recv()
             print(f"Server received: {result}")
             await ws.send(query1_server_answer.format(query_id=1))
-            await TestServer.send_complete(ws, 1)
+            await WebSocketServer.send_complete(ws, 1)
         else:
             await ws.send(
                 '{"type":"connection_error", "payload": "Invalid Authorization token"}'

tests/test_websocket_subscription.py

@@ -8,7 +8,7 @@
 from gql import Client, gql
 from gql.transport.websockets import WebsocketsTransport
 
-from .conftest import MS, TestServer
+from .conftest import MS, WebSocketServer
 
 countdown_server_answer = (
     '{{"type":"data","id":"{query_id}","payload":{{"data":{{"number":{number}}}}}}}'
@@ -20,9 +20,9 @@
 async def server_countdown(ws, path):
     global WITH_KEEPALIVE
     try:
-        await TestServer.send_connection_ack(ws)
+        await WebSocketServer.send_connection_ack(ws)
         if WITH_KEEPALIVE:
-            await TestServer.send_keepalive(ws)
+            await WebSocketServer.send_keepalive(ws)
 
         result = await ws.recv()
         json_result = json.loads(result)
@@ -58,7 +58,7 @@ async def stopping_coro():
         async def keepalive_coro():
             while True:
                 await asyncio.sleep(5 * MS)
-                await TestServer.send_keepalive(ws)
+                await WebSocketServer.send_keepalive(ws)
 
         stopping_task = asyncio.ensure_future(stopping_coro())
         keepalive_task = asyncio.ensure_future(keepalive_coro())
@@ -82,8 +82,8 @@ async def keepalive_coro():
             except asyncio.CancelledError:
                 print("Now keepalive task is cancelled")
 
-        await TestServer.send_complete(ws, query_id)
-        await TestServer.wait_connection_terminate(ws)
+        await WebSocketServer.send_complete(ws, query_id)
+        await WebSocketServer.wait_connection_terminate(ws)
     except websockets.exceptions.ConnectionClosedOK:
         pass
     finally:
@@ -228,7 +228,7 @@ async def close_transport_task_coro():
 
 
 async def server_countdown_close_connection_in_middle(ws, path):
-    await TestServer.send_connection_ack(ws)
+    await WebSocketServer.send_connection_ack(ws)
 
     result = await ws.recv()
     json_result = json.loads(result)