Replace docker-compose by testcontainers (#343)

Author: Kludex

.github/workflows/main.yml

@@ -63,8 +63,6 @@ jobs:
           echo "203.0.113.0 logfire.dev" | sudo tee -a /etc/hosts
           echo "203.0.113.0 logfire-api.pydantic.dev" | sudo tee -a /etc/hosts
           echo "203.0.113.0 logfire.pydantic.dev" | sudo tee -a /etc/hosts
-      - name: Setup services
-        run: docker-compose up -d
       - name: set up python
         uses: actions/setup-python@v5
         with:

Makefile

@@ -30,10 +30,6 @@ lint:
 test:
 	rye run coverage run -m pytest
 
-.PHONY: test-integration  # Run the integration tests
-test-integration:
-	rye run coverage run -m pytest -m 'integration'
-
 .PHONY: generate-stubs  # Generate stubs for logfire-api
 generate-stubs:
 	rye run generate-stubs

compose.yml

@@ -135,6 +135,7 @@ dev-dependencies = [
     "sqlmodel",
     "mypy>=1.10.0",
     "celery>=5.4.0",
+    "testcontainers",
 ]
 
 [tool.rye.scripts]
@@ -213,7 +214,6 @@ venvPath = ".venv"
 
 [tool.pytest.ini_options]
 xfail_strict = true
-markers = ['integration: mark a test as an integration test']
 filterwarnings = [
     "error",
     # fastapi uses deprecated pydantic functions

pyproject.toml

@@ -6,7 +6,6 @@
 #   features: []
 #   all-features: false
 #   with-sources: false
-#   generate-hashes: false
 
 -e file:.
 aiohttp==3.9.5
@@ -85,6 +84,8 @@ django==5.0.7
 dnspython==2.6.1
     # via email-validator
     # via pymongo
+docker==7.1.0
+    # via testcontainers
 email-validator==2.2.0
     # via fastapi
 eval-type-backport==0.2.0
@@ -378,6 +379,7 @@ redis==5.0.7
 regex==2024.7.24
     # via mkdocs-material
 requests==2.32.3
+    # via docker
     # via huggingface-hub
     # via mkdocs-material
     # via opentelemetry-exporter-otlp-proto-http
@@ -409,6 +411,7 @@ sqlparse==0.5.1
 starlette==0.37.2
     # via fastapi
 structlog==24.4.0
+testcontainers==4.7.2
 tokenizers==0.19.1
     # via anthropic
 toml==0.10.2
@@ -433,12 +436,15 @@ typing-extensions==4.12.2
     # via pydantic
     # via pydantic-core
     # via sqlalchemy
+    # via testcontainers
     # via typer
 tzdata==2024.1
     # via celery
     # via pandas
 urllib3==2.2.2
+    # via docker
     # via requests
+    # via testcontainers
 uvicorn==0.30.3
     # via fastapi
 uvloop==0.19.0
@@ -466,6 +472,7 @@ wrapt==1.16.0
     # via opentelemetry-instrumentation-dbapi
     # via opentelemetry-instrumentation-redis
     # via opentelemetry-instrumentation-sqlalchemy
+    # via testcontainers
 yarl==1.9.4
     # via aiohttp
 zipp==3.19.2

requirements-dev.lock

@@ -6,7 +6,6 @@
 #   features: []
 #   all-features: false
 #   with-sources: false
-#   generate-hashes: false
 
 -e file:.
 certifi==2024.7.4

requirements.lock

@@ -1,41 +1,29 @@
-"""This module contains tests for the Celery integration.
-
-To be able to run those tests, you need to have Redis running on localhost:6379.
-We have a docker compose file that you can use to start Redis:
-
-    ```bash
-    docker compose up -d redis
-    ```
-"""
-
 import logging
-from typing import Iterator
+from typing import Generator, Iterator
 
 import pytest
-import redis
-import redis.exceptions
 from celery import Celery
 from celery.contrib.testing.worker import start_worker
 from celery.worker.worker import WorkController
 from dirty_equals import IsStr
 from inline_snapshot import snapshot
 from opentelemetry.instrumentation.celery import CeleryInstrumentor
+from testcontainers.redis import RedisContainer
 
 import logfire
 from logfire.testing import TestExporter
 
-pytestmark = [pytest.mark.integration]
 
-try:
-    client = redis.Redis()
-    client.ping()  # type: ignore
-except redis.exceptions.ConnectionError:  # pragma: no cover
-    pytestmark.append(pytest.mark.skip('Redis is not running'))
+@pytest.fixture(scope='module', autouse=True)
+def redis_container() -> Generator[RedisContainer, None, None]:
+    with RedisContainer('redis:latest') as redis:
+        yield redis
 
 
 @pytest.fixture
-def celery_app() -> Iterator[Celery]:
-    app = Celery('tasks', broker='redis://localhost:6379/0', backend='redis://localhost:6379/0')
+def celery_app(redis_container: RedisContainer) -> Iterator[Celery]:
+    redis_uri = f'redis://{redis_container.get_container_host_ip()}:{redis_container.get_exposed_port(6379)}/0'
+    app = Celery('tasks', broker=redis_uri, backend=redis_uri)
 
     @app.task(name='tasks.say_hello')  # type: ignore
     def say_hello():  # type: ignore