fixed tests

Author: sanderegg

packages/service-library/tests/aiohttp/test_client_session.py

@@ -2,7 +2,6 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
-import asyncio
 import json
 from collections.abc import Callable, Iterator
 from typing import Any
@@ -20,7 +19,7 @@
 
 
 @pytest.fixture
-def server(aiohttp_server: Callable) -> Iterator[TestServer]:
+async def server(aiohttp_server: Callable) -> Iterator[TestServer]:
     async def echo(request):
         got = await request.json()
         return web.json_response(data=got)
@@ -32,7 +31,7 @@ async def echo(request):
 
     assert not app.get(APP_CLIENT_SESSION_KEY)
 
-    test_server = asyncio.get_event_loop().run_until_complete(aiohttp_server(app))
+    test_server = await aiohttp_server(app)
 
     assert isinstance(app[APP_CLIENT_SESSION_KEY], ClientSession)
     assert not app[APP_CLIENT_SESSION_KEY].closed

packages/service-library/tests/aiohttp/test_requests_validation.py

@@ -2,7 +2,6 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
-import asyncio
 import json
 from collections.abc import Callable
 from uuid import UUID
@@ -100,7 +99,7 @@ def create_fake(cls, faker: Faker):
 
 
 @pytest.fixture
-def client(aiohttp_client: Callable, faker: Faker) -> TestClient:
+async def client(aiohttp_client: Callable, faker: Faker) -> TestClient:
     """
     Some app that:
 
@@ -163,7 +162,7 @@ async def _middleware(request: web.Request, handler):
     # adds handler
     app.add_routes([web.get("/projects/{project_uuid}", _handler)])
 
-    return asyncio.get_event_loop().run_until_complete(aiohttp_client(app))
+    return await aiohttp_client(app)
 
 
 @pytest.fixture

packages/service-library/tests/test_async_utils.py

@@ -99,7 +99,7 @@ def make_context():
         params = copy.deepcopy(context)
         params["control"] = control
 
-        task = asyncio.get_event_loop().create_task(orderly(**params))
+        task = asyncio.create_task(orderly(**params))
         tasks.append(task)
 
     for task in tasks:
@@ -146,8 +146,7 @@ async def target_function(the_param: Any) -> None:
         await target_function("something")
 
     message = (
-        f"Expected '{expected_param_name}' in "
-        f"'{target_function.__name__}' arguments."
+        f"Expected '{expected_param_name}' in '{target_function.__name__}' arguments."
     )
     assert str(excinfo.value).startswith(message) is True