Migrate tests from docker compose

Author: AHGIJMKLKKZNPJKQR

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on: [push]
 jobs:
   static-checks:
     runs-on: ubuntu-latest
-    strategy: &python-matrix
+    strategy:
       matrix:
         python-version:
           - "3.11"
@@ -38,21 +38,10 @@ jobs:
 
       - name: Type check
         run: uv run pyright
+      
+      - name: Type check
+        run: uv run pytest
+        env:
+          FISHJAM_ID: ${{ secrets.CI_FISHJAM_ID }}
+          FISHJAM_MANAGEMENT_TOKEN: ${{ secrets.CI_FISHJAM_MANAGEMENT_TOKEN }}
 
-  test:
-    runs-on: ubuntu-latest
-    strategy: *python-matrix
-    env:
-      PYTHON_VERSION: ${{ matrix.python-version }}
-    name: test
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Log in to GitHub Container Registry
-        run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login ghcr.io -u USERNAME --password-stdin
-
-      - name: Run tests
-        run: docker compose -f docker-compose-test.yaml up test --exit-code-from test
-
-      - name: Tear down test containers
-        run: docker compose -f docker-compose-test.yaml down

docker-compose-test.yaml

@@ -1,5 +1,4 @@
 import asyncio
-import os
 from contextlib import suppress
 
 import pytest
@@ -14,15 +13,12 @@
     ServerMessagePeerMetadataUpdated,
 )
 from fishjam.events.allowed_notifications import AllowedNotification
-
-HOST = "proxy" if os.getenv("DOCKER_TEST") == "TRUE" else "localhost"
-FISHJAM_ID = f"http://{HOST}:5555"
-SERVER_API_TOKEN = os.getenv("MANAGEMENT_TOKEN", "development")
+from tests.support.env import FISHJAM_ID, FISHJAM_MANAGEMENT_TOKEN
 
 
 @pytest.fixture
 def room_api():
-    return FishjamClient(FISHJAM_ID, SERVER_API_TOKEN)
+    return FishjamClient(FISHJAM_ID, FISHJAM_MANAGEMENT_TOKEN)
 
 
 @pytest.fixture
@@ -43,7 +39,7 @@ def agent(room: Room, room_api: FishjamClient):
 async def notifier():
     notifier = FishjamNotifier(
         fishjam_id=FISHJAM_ID,
-        management_token=SERVER_API_TOKEN,
+        management_token=FISHJAM_MANAGEMENT_TOKEN,
     )
 
     @notifier.on_server_notification

tests/Dockerfile

@@ -0,0 +1,4 @@
+import os
+
+FISHJAM_ID = os.environ["FISHJAM_ID"]
+FISHJAM_MANAGEMENT_TOKEN = os.environ["FISHJAM_MANAGEMENT_TOKEN"]

tests/agent/test_agent.py

@@ -26,3 +26,7 @@ def run_server(queue):
     global DATA_QUEUE
     DATA_QUEUE = queue
     app.run(port=5000, host="0.0.0.0", use_reloader=False, debug=False, threaded=True)
+
+
+WEBHOOK_SERVER_URL = "http://localhost:5000/"
+WEBHOOK_URL = f"{WEBHOOK_SERVER_URL}webhook"

tests/support/env.py

@@ -1,7 +1,6 @@
 # pylint: disable=locally-disabled, missing-class-docstring, missing-function-docstring, redefined-outer-name, too-few-public-methods, missing-module-docstring
 
 import asyncio
-import os
 import socket
 import time
 from multiprocessing import Process, Queue
@@ -20,15 +19,10 @@
     ServerMessageRoomDeleted,
 )
 from tests.support.asyncio_utils import assert_events, cancel
+from tests.support.env import FISHJAM_ID, FISHJAM_MANAGEMENT_TOKEN
 from tests.support.peer_socket import PeerSocket
-from tests.support.webhook_notifier import run_server
-
-FISHJAM_HOST = "proxy" if os.getenv("DOCKER_TEST") == "TRUE" else "localhost"
-FISHJAM_URL = f"http://{FISHJAM_HOST}:5555"
-FISHJAM_ID = FISHJAM_URL
-SERVER_API_TOKEN = os.getenv("MANAGEMENT_TOKEN", "development")
-WEBHOOK_ADDRESS = "test" if os.getenv("DOCKER_TEST") == "TRUE" else "localhost"
-WEBHOOK_URL = f"http://{WEBHOOK_ADDRESS}:5000/webhook"
+from tests.support.webhook_notifier import WEBHOOK_SERVER_URL, WEBHOOK_URL, run_server
+
 queue = Queue()
 
 
@@ -40,7 +34,7 @@ def start_server():
     timeout = 60  # wait maximum of 60 seconds
     while True:
         try:
-            response = requests.get(f"http://{WEBHOOK_ADDRESS}:5000/", timeout=1_000)
+            response = requests.get(WEBHOOK_SERVER_URL, timeout=1_000)
             if response.status_code == 200:  # Or another condition
                 break
         except (requests.ConnectionError, socket.error):
@@ -59,7 +53,7 @@ class TestConnectingToServer:
     async def test_valid_credentials(self):
         notifier = FishjamNotifier(
             fishjam_id=FISHJAM_ID,
-            management_token=SERVER_API_TOKEN,
+            management_token=FISHJAM_MANAGEMENT_TOKEN,
         )
 
         @notifier.on_server_notification
@@ -77,14 +71,14 @@ def handle_notitifcation(_notification):
 
 @pytest.fixture
 def room_api():
-    return FishjamClient(FISHJAM_ID, SERVER_API_TOKEN)
+    return FishjamClient(FISHJAM_ID, FISHJAM_MANAGEMENT_TOKEN)
 
 
 @pytest.fixture
 def notifier():
     notifier = FishjamNotifier(
         fishjam_id=FISHJAM_ID,
-        management_token=SERVER_API_TOKEN,
+        management_token=FISHJAM_MANAGEMENT_TOKEN,
     )
 
     return notifier
@@ -133,7 +127,7 @@ async def test_peer_connected_disconnected(
         room = room_api.create_room(options=options)
 
         peer, token = room_api.create_peer(room.id)
-        peer_socket = PeerSocket(fishjam_url=FISHJAM_URL)
+        peer_socket = PeerSocket(fishjam_url=FISHJAM_ID)
         peer_task = asyncio.create_task(peer_socket.connect(token))
 
         await peer_socket.wait_ready()
@@ -168,7 +162,7 @@ async def test_peer_connected_room_deleted(
         room = room_api.create_room(options=options)
         _peer, token = room_api.create_peer(room.id)
 
-        peer_socket = PeerSocket(fishjam_url=FISHJAM_URL)
+        peer_socket = PeerSocket(fishjam_url=FISHJAM_ID)
         peer_task = asyncio.create_task(peer_socket.connect(token))
 
         await peer_socket.wait_ready()

tests/support/webhook_notifier.py

@@ -1,4 +1,3 @@
-import os
 from unittest.mock import Mock, patch
 
 import httpx
@@ -29,10 +28,7 @@
     VideoCodec,
 )
 from fishjam.version import get_version
-
-HOST = "proxy" if os.getenv("DOCKER_TEST") == "TRUE" else "localhost"
-FISHJAM_ID = f"http://{HOST}:5555"
-MANAGEMENT_TOKEN = os.getenv("MANAGEMENT_TOKEN", "development")
+from tests.support.env import FISHJAM_ID, FISHJAM_MANAGEMENT_TOKEN
 
 MAX_PEERS = 10
 CODEC_H264 = "h264"
@@ -49,7 +45,7 @@ def test_invalid_token(self):
             room_api.create_room()
 
     def test_valid_token(self):
-        room_api = FishjamClient(FISHJAM_ID, MANAGEMENT_TOKEN)
+        room_api = FishjamClient(FISHJAM_ID, FISHJAM_MANAGEMENT_TOKEN)
 
         room = room_api.create_room()
         all_rooms = room_api.get_all_rooms()
@@ -71,7 +67,7 @@ def mock_send(request, **kwargs):
             captured_headers = dict(request.headers)
             return mock_response
 
-        room_api = FishjamClient(FISHJAM_ID, MANAGEMENT_TOKEN)
+        room_api = FishjamClient(FISHJAM_ID, FISHJAM_MANAGEMENT_TOKEN)
 
         with patch.object(httpx.HTTPTransport, "handle_request", side_effect=mock_send):
             try:
@@ -89,7 +85,7 @@ def mock_send(request, **kwargs):
 
 @pytest.fixture
 def room_api():
-    return FishjamClient(FISHJAM_ID, MANAGEMENT_TOKEN)
+    return FishjamClient(FISHJAM_ID, FISHJAM_MANAGEMENT_TOKEN)
 
 
 class TestCreateRoom: