Fix tests

Author: AHGIJMKLKKZNPJKQR

.github/workflows/ci.yml

@@ -55,13 +55,14 @@ jobs:
       - name: Initialize Localtunnel
         id: tunnel
         run: |
-          npx localtunnel --port 5000 > tunnel.log 2>&1 &
-          
+          npm install -g localtunnel
+          localtunnel --port 5000 > tunnel.log 2>&1 &
+
           # Poll for the URL
-          TIMEOUT=10
+          TIMEOUT=15
           ELAPSED=0
           echo "Waiting for localtunnel to generate URL..."
-          
+
           while ! grep -q "https://" tunnel.log; do
             if [ $ELAPSED -ge $TIMEOUT ]; then
               echo "Error: Localtunnel timed out after ${TIMEOUT}s"
@@ -71,7 +72,7 @@ jobs:
             sleep 1
             ELAPSED=$((ELAPSED + 1))
           done
-          
+
           TUNNEL_URL=$(grep -o 'https://[^ ]*' tunnel.log | head -n 1)
           echo "url=$TUNNEL_URL" >> $GITHUB_OUTPUT
           echo "Localtunnel is live at: $TUNNEL_URL"

tests/support/webhook_notifier.py

@@ -5,7 +5,7 @@
 from fishjam import receive_binary
 
 app = Flask(__name__)
-DATA_QUEUE = None
+QUEUES = None
 
 
 @app.route("/", methods=["GET"])
@@ -17,12 +17,13 @@ def respond_default():
 def respond_root():
     data = request.get_data()
     msg = receive_binary(data)
-    DATA_QUEUE.put(msg)
+    for q in QUEUES:
+        q.put(msg)
 
     return Response(status=200)
 
 
-def run_server(queue):
-    global DATA_QUEUE
-    DATA_QUEUE = queue
+def run_server(queues):
+    global QUEUES
+    QUEUES = queues
     app.run(port=5000, host="0.0.0.0", use_reloader=False, debug=False, threaded=True)

tests/test_notifier.py

@@ -1,7 +1,7 @@
 # pylint: disable=locally-disabled, missing-class-docstring, missing-function-docstring, redefined-outer-name, too-few-public-methods, missing-module-docstring
 
 import asyncio
-from multiprocessing import Process, Queue
+from multiprocessing import Manager, Process
 
 import pytest
 import requests
@@ -28,12 +28,13 @@
 from tests.support.peer_socket import PeerSocket
 from tests.support.webhook_notifier import run_server
 
-queue = Queue()
+_manager = Manager()
+_queues = _manager.list()
 
 
 @pytest.fixture(scope="session", autouse=True)
 def start_server():
-    flask_process = Process(target=run_server, args=(queue,))
+    flask_process = Process(target=run_server, args=(_queues,))
     flask_process.start()
 
     session = requests.Session()
@@ -55,6 +56,14 @@ def start_server():
     flask_process.terminate()
 
 
+@pytest.fixture
+def event_queue():
+    q = _manager.Queue()
+    _queues.append(q)
+    yield q
+    _queues.remove(q)
+
+
 class TestConnectingToServer:
     @pytest.mark.asyncio
     async def test_valid_credentials(self):
@@ -97,7 +106,7 @@ def notifier():
 class TestReceivingNotifications:
     @pytest.mark.asyncio
     async def test_room_created_deleted(
-        self, room_api: FishjamClient, notifier: FishjamNotifier
+        self, room_api: FishjamClient, notifier: FishjamNotifier, event_queue
     ):
         event_checks = [ServerMessageRoomCreated, ServerMessageRoomDeleted]
 
@@ -117,11 +126,11 @@ async def test_room_created_deleted(
             notifier_task.cancel()
 
         for event in event_checks:
-            self.assert_event(event)
+            self.assert_event(event, event_queue)
 
     @pytest.mark.asyncio
     async def test_peer_connected_disconnected(
-        self, room_api: FishjamClient, notifier: FishjamNotifier
+        self, room_api: FishjamClient, notifier: FishjamNotifier, event_queue
     ):
         event_checks = [
             ServerMessageRoomCreated,
@@ -156,11 +165,11 @@ async def test_peer_connected_disconnected(
             peer_socket_task.cancel()
 
         for event in event_checks:
-            self.assert_event(event)
+            self.assert_event(event, event_queue)
 
     @pytest.mark.asyncio
     async def test_peer_connected_room_deleted(
-        self, room_api: FishjamClient, notifier: FishjamNotifier
+        self, room_api: FishjamClient, notifier: FishjamNotifier, event_queue
     ):
         event_checks = [
             ServerMessageRoomCreated,
@@ -193,8 +202,8 @@ async def test_peer_connected_room_deleted(
             peer_socket_task.cancel()
 
         for event in event_checks:
-            self.assert_event(event)
+            self.assert_event(event, event_queue)
 
-    def assert_event(self, event):
-        data = queue.get(timeout=5)
+    def assert_event(self, event, event_queue):
+        data = event_queue.get(timeout=5)
         assert data == event or isinstance(data, event)