Test fixes

Author: AHGIJMKLKKZNPJKQR

tests/support/asyncio_utils.py

@@ -29,11 +29,3 @@ def handle_message(message):
         raise asyncio.exceptions.TimeoutError(
             f"{message_checks[0]} hasn't been received within timeout"
         ) from exc
-
-
-async def cancel(task):
-    task.cancel()
-    try:
-        await task
-    except asyncio.exceptions.CancelledError:
-        pass

tests/support/env.py

@@ -2,5 +2,5 @@
 
 FISHJAM_ID = os.environ["FISHJAM_ID"]
 FISHJAM_MANAGEMENT_TOKEN = os.environ["FISHJAM_MANAGEMENT_TOKEN"]
-WEBHOOK_SERVER_URL = os.getenv("WEBHOOK_SERVER_URL", "http://localhost:5000/")
-WEBHOOK_URL = f"{WEBHOOK_SERVER_URL}webhook"
+WEBHOOK_SERVER_URL = os.getenv("WEBHOOK_SERVER_URL", "http://localhost:5000")
+WEBHOOK_URL = f"{WEBHOOK_SERVER_URL}/webhook"

tests/test_notifier.py

@@ -18,7 +18,7 @@
     ServerMessageRoomCreated,
     ServerMessageRoomDeleted,
 )
-from tests.support.asyncio_utils import assert_events, cancel
+from tests.support.asyncio_utils import assert_events
 from tests.support.env import (
     FISHJAM_ID,
     FISHJAM_MANAGEMENT_TOKEN,
@@ -65,13 +65,14 @@ async def test_valid_credentials(self):
         def handle_notitifcation(_notification):
             pass
 
-        notifier_task = asyncio.create_task(notifier.connect())
-        await notifier.wait_ready()
-        assert (
-            notifier._websocket and notifier._websocket.state == websockets.State.OPEN
-        )
+        async with asyncio.TaskGroup() as tg:
+            tg.create_task(notifier.connect())
+            await notifier.wait_ready()
 
-        await cancel(notifier_task)
+            assert (
+                notifier._websocket
+                and notifier._websocket.state == websockets.State.OPEN
+            )
 
 
 @pytest.fixture
@@ -95,18 +96,19 @@ async def test_room_created_deleted(
         self, room_api: FishjamClient, notifier: FishjamNotifier
     ):
         event_checks = [ServerMessageRoomCreated, ServerMessageRoomDeleted]
-        assert_task = asyncio.create_task(assert_events(notifier, event_checks.copy()))
 
-        notifier_task = asyncio.create_task(notifier.connect())
-        await notifier.wait_ready()
+        async with asyncio.TaskGroup() as tg:
+            assert_task = tg.create_task(assert_events(notifier, event_checks.copy()))
+
+            tg.create_task(notifier.connect())
+            await notifier.wait_ready()
 
-        options = RoomOptions(webhook_url=WEBHOOK_URL)
-        room = room_api.create_room(options=options)
+            options = RoomOptions(webhook_url=WEBHOOK_URL)
+            room = room_api.create_room(options=options)
 
-        room_api.delete_room(room.id)
+            room_api.delete_room(room.id)
 
-        await assert_task
-        await cancel(notifier_task)
+            await assert_task
 
         for event in event_checks:
             self.assert_event(event)
@@ -123,26 +125,26 @@ async def test_peer_connected_disconnected(
             ServerMessagePeerDeleted,
             ServerMessageRoomDeleted,
         ]
-        assert_task = asyncio.create_task(assert_events(notifier, event_checks.copy()))
 
-        notifier_task = asyncio.create_task(notifier.connect())
-        await notifier.wait_ready()
+        async with asyncio.TaskGroup() as tg:
+            assert_task = tg.create_task(assert_events(notifier, event_checks.copy()))
 
-        options = RoomOptions(webhook_url=WEBHOOK_URL)
-        room = room_api.create_room(options=options)
+            tg.create_task(notifier.connect())
+            await notifier.wait_ready()
 
-        peer, token = room_api.create_peer(room.id)
-        peer_socket = PeerSocket(fishjam_url=FISHJAM_ID)
-        peer_task = asyncio.create_task(peer_socket.connect(token))
+            options = RoomOptions(webhook_url=WEBHOOK_URL)
+            room = room_api.create_room(options=options)
 
-        await peer_socket.wait_ready()
+            peer, token = room_api.create_peer(room.id)
+            peer_socket = PeerSocket(fishjam_url=FISHJAM_ID)
+            tg.create_task(peer_socket.connect(token))
 
-        room_api.delete_peer(room.id, peer.id)
-        room_api.delete_room(room.id)
+            await peer_socket.wait_ready()
 
-        await assert_task
-        await cancel(peer_task)
-        await cancel(notifier_task)
+            room_api.delete_peer(room.id, peer.id)
+            room_api.delete_room(room.id)
+
+            await assert_task
 
         for event in event_checks:
             self.assert_event(event)
@@ -158,25 +160,25 @@ async def test_peer_connected_room_deleted(
             ServerMessagePeerDeleted,
             ServerMessageRoomDeleted,
         ]
-        assert_task = asyncio.create_task(assert_events(notifier, event_checks.copy()))
 
-        notifier_task = asyncio.create_task(notifier.connect())
-        await notifier.wait_ready()
+        async with asyncio.TaskGroup() as tg:
+            assert_task = tg.create_task(assert_events(notifier, event_checks.copy()))
+
+            tg.create_task(notifier.connect())
+            await notifier.wait_ready()
 
-        options = RoomOptions(webhook_url=WEBHOOK_URL)
-        room = room_api.create_room(options=options)
-        _peer, token = room_api.create_peer(room.id)
+            options = RoomOptions(webhook_url=WEBHOOK_URL)
+            room = room_api.create_room(options=options)
+            _peer, token = room_api.create_peer(room.id)
 
-        peer_socket = PeerSocket(fishjam_url=FISHJAM_ID)
-        peer_task = asyncio.create_task(peer_socket.connect(token))
+            peer_socket = PeerSocket(fishjam_url=FISHJAM_ID)
+            tg.create_task(peer_socket.connect(token))
 
-        await peer_socket.wait_ready()
+            await peer_socket.wait_ready()
 
-        room_api.delete_room(room.id)
+            room_api.delete_room(room.id)
 
-        await assert_task
-        await cancel(peer_task)
-        await cancel(notifier_task)
+            await assert_task
 
         for event in event_checks:
             self.assert_event(event)