Fix tests

Author: AHGIJMKLKKZNPJKQR

.dockerignore

@@ -0,0 +1 @@
+**/.venv

docker-compose-test.yaml

@@ -5,18 +5,14 @@ services:
     restart: on-failure
     healthcheck:
       test: >
-        curl --fail -H "authorization: Bearer development" http://fishjam:5002/room || exit 1
+        curl --fail-with-body -H "Authorization: Bearer 12345" http://fishjam:5002/admin/health
       interval: 3s
       retries: 2
       timeout: 2s
       start_period: 30s
     environment:
       FJ_HOST: "fishjam:5002"
-      FJ_INTEGRATED_TURN_IP: "${INTEGRATED_TURN_IP:-127.0.0.1}"
-      FJ_INTEGRATED_TURN_LISTEN_IP: "0.0.0.0"
-      FJ_INTEGRATED_TURN_PORT_RANGE: "50000-50050"
-      FJ_INTEGRATED_TCP_TURN_PORT: "49999"
-      FJ_SERVER_API_TOKEN: "development"
+      FJ_ADMIN_TOKEN: "12345"
       FJ_PORT: 5002
       FJ_SECRET_KEY_BASE: "super-secret-key"
       FJ_SIP_IP: "127.0.0.1"
@@ -31,34 +27,21 @@ services:
   fishjam-prep:
     image: curlimages/curl:8.12.1
     command: >
-      curl --fail-with-body -XPOST http://fishjam:5002/admin/user --json '{"id": "testuser", "token": "development"}'
+      curl --fail-with-body -H "Authorization: Bearer 12345" -XPOST http://fishjam:5002/admin/user --json '{"id": "testuser", "token": "development"}'
     depends_on:
       fishjam:
         condition: service_healthy
 
   test:
     container_name: test
-    image: "cimg/python:${PYTHON_VERSION:-3.10}"
-    command: sh -c "cd /app && \ poetry config virtualenvs.in-project false && \ poetry install --no-ansi && \ poetry run pytest -s"
+    build:
+      context: .
+      dockerfile: tests/Dockerfile
+      args:
+        PYTHON_VERSION: ${PYTHON_VERSION:-3.10}
+    command: poetry run pytest
     environment:
       DOCKER_TEST: "TRUE"
-    ports:
-      - "5000:5000"
-    volumes:
-      - .:/app
-    depends_on:
-      fishjam-prep:
-        condition: service_completed_successfully
-
-  examples:
-    container_name: examples
-    image: "cimg/python:${PYTHON_VERSION:-3.10}"
-    command: sh -c "cd /app && \ poetry config virtualenvs.in-project false && \ poetry cache clear pypi --all && \ poetry install --no-ansi && \ poetry run examples"
-    environment:
-      DOCKER_TEST: "TRUE"
-      CI_LIMIT: "10"
-    volumes:
-      - .:/app
     depends_on:
       fishjam-prep:
         condition: service_completed_successfully

fishjam/_openapi_client/models/room_config.py

@@ -20,7 +20,7 @@ class RoomConfig:
     """Duration (in seconds) after which the peer will be removed if it is disconnected. If not provided, this feature is disabled."""
     peerless_purge_timeout: Union[Unset, None, int] = UNSET
     """Duration (in seconds) after which the room will be removed if no peers are connected. If not provided, this feature is disabled."""
-    room_type: Union[Unset, None, RoomConfigRoomType] = UNSET
+    room_type: Union[Unset, RoomConfigRoomType] = RoomConfigRoomType.FULL_FEATURE
     """The use-case of the room. If not provided, this defaults to full_feature."""
     video_codec: Union[Unset, None, RoomConfigVideoCodec] = UNSET
     """Enforces video codec for each peer in the room"""
@@ -34,9 +34,9 @@ def to_dict(self) -> Dict[str, Any]:
         max_peers = self.max_peers
         peer_disconnected_timeout = self.peer_disconnected_timeout
         peerless_purge_timeout = self.peerless_purge_timeout
-        room_type: Union[Unset, None, str] = UNSET
+        room_type: Union[Unset, str] = UNSET
         if not isinstance(self.room_type, Unset):
-            room_type = self.room_type.value if self.room_type else None
+            room_type = self.room_type.value
 
         video_codec: Union[Unset, None, str] = UNSET
         if not isinstance(self.video_codec, Unset):
@@ -73,10 +73,8 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         peerless_purge_timeout = d.pop("peerlessPurgeTimeout", UNSET)
 
         _room_type = d.pop("roomType", UNSET)
-        room_type: Union[Unset, None, RoomConfigRoomType]
-        if _room_type is None:
-            room_type = None
-        elif isinstance(_room_type, Unset):
+        room_type: Union[Unset, RoomConfigRoomType]
+        if isinstance(_room_type, Unset):
             room_type = UNSET
         else:
             room_type = RoomConfigRoomType(_room_type)

fishjam/api/_fishjam_client.py

@@ -63,7 +63,7 @@ class RoomOptions:
     """Enforces video codec for each peer in the room"""
     webhook_url: str | None = None
     """URL where Fishjam notifications will be sent"""
-    room_type: Literal["full_feature", "audio_only", "broadcaster"] | None = None
+    room_type: Literal["full_feature", "audio_only", "broadcaster"] = "full_feature"
     """The use-case of the room. If not provided, this defaults to full_feature."""
 
 
@@ -130,7 +130,7 @@ def create_room(self, options: RoomOptions | None = None) -> Room:
             peerless_purge_timeout=options.peerless_purge_timeout,
             video_codec=codec,
             webhook_url=options.webhook_url,
-            room_type=options.room_type and RoomConfigRoomType(options.room_type),
+            room_type=RoomConfigRoomType(options.room_type),
         )
 
         room = cast(

tests/Dockerfile

@@ -0,0 +1,20 @@
+ARG PYTHON_VERSION=3.10
+
+FROM python:$PYTHON_VERSION-slim as builder
+
+ARG POETRY_VERSION=2.1
+
+ENV POETRY_HOME=/opt/poetry
+ENV POETRY_VIRTUALENVS_IN_PROJECT=1
+ENV POETRY_VIRTUALENVS_CREATE=1
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
+ENV POETRY_CACHE_DIR=/opt/.cache
+
+RUN pip install "poetry==${POETRY_VERSION}"
+
+WORKDIR /app
+
+COPY pyproject.toml poetry.lock /app/
+RUN poetry install --with=dev --no-root && rm -rf $POETRY_CACHE_DIR
+COPY . /app/