Make tests less flaky

Author: AHGIJMKLKKZNPJKQR

tests/support/asyncio_utils.py

@@ -4,7 +4,7 @@
 
 from fishjam import FishjamNotifier
 
-ASSERTION_TIMEOUT = 5.0
+ASSERTION_TIMEOUT = 15.0
 
 
 async def assert_events(notifier: FishjamNotifier, event_checks: list):

tests/support/webhook_notifier.py

@@ -17,8 +17,9 @@ def respond_default():
 def respond_root():
     data = request.get_data()
     msg = receive_binary(data)
-    for q in QUEUES:
-        q.put(msg)
+    if msg is not None:
+        for q in QUEUES.values():
+            q.put(msg)
 
     return Response(status=200)
 

tests/test_notifier.py

@@ -1,6 +1,7 @@
 # pylint: disable=locally-disabled, missing-class-docstring, missing-function-docstring, redefined-outer-name, too-few-public-methods, missing-module-docstring
 
 import asyncio
+import uuid
 from multiprocessing import Manager, Process
 
 import pytest
@@ -29,7 +30,7 @@
 from tests.support.webhook_notifier import run_server
 
 _manager = Manager()
-_queues = _manager.list()
+_queues = _manager.dict()
 
 
 @pytest.fixture(scope="session", autouse=True)
@@ -59,9 +60,10 @@ def start_server():
 @pytest.fixture
 def event_queue():
     q = _manager.Queue()
-    _queues.append(q)
+    key = str(uuid.uuid4())
+    _queues[key] = q
     yield q
-    _queues.remove(q)
+    del _queues[key]
 
 
 class TestConnectingToServer:
@@ -126,7 +128,7 @@ async def test_room_created_deleted(
             notifier_task.cancel()
 
         for event in event_checks:
-            self.assert_event(event, event_queue)
+            self.assert_event(event, event_queue, room.id)
 
     @pytest.mark.asyncio
     async def test_peer_connected_disconnected(
@@ -165,7 +167,7 @@ async def test_peer_connected_disconnected(
             peer_socket_task.cancel()
 
         for event in event_checks:
-            self.assert_event(event, event_queue)
+            self.assert_event(event, event_queue, room.id)
 
     @pytest.mark.asyncio
     async def test_peer_connected_room_deleted(
@@ -202,8 +204,13 @@ async def test_peer_connected_room_deleted(
             peer_socket_task.cancel()
 
         for event in event_checks:
-            self.assert_event(event, event_queue)
-
-    def assert_event(self, event, event_queue):
-        data = event_queue.get(timeout=5)
-        assert data == event or isinstance(data, event)
+            self.assert_event(event, event_queue, room.id)
+
+    def assert_event(self, event, event_queue, room_id=None):
+        for _ in range(20):
+            data = event_queue.get(timeout=10)
+            if room_id and data.room_id != room_id:
+                continue
+            assert data == event or isinstance(data, event), (
+                f"Expected {event} but last received: {data}"
+            )