diff options
Diffstat (limited to 'tests/fixtures/http.py')
| -rw-r--r-- | tests/fixtures/http.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/tests/fixtures/http.py b/tests/fixtures/http.py index 4b0792c..e38c853 100644 --- a/tests/fixtures/http.py +++ b/tests/fixtures/http.py @@ -5,12 +5,13 @@ from typing import Any import httpx import pytest -import redis import requests_mock from asgi_lifespan import LifespanManager +from generalresearch.redis_helper import RedisConfig from httpx import ASGITransport, AsyncClient from jb.config import JB_EVENTS_STREAM, settings +from jb.decorators import get_redis_config from jb.main import app from jb.models.assignment import AssignmentStub from jb.models.hit import Hit @@ -23,7 +24,8 @@ def anyio_backend(): @pytest.fixture(scope="session") -async def httpxclient() -> AsyncGenerator[AsyncClient, None]: +async def httpxclient(redis_config: RedisConfig) -> AsyncGenerator[AsyncClient, None]: + app.dependency_overrides[get_redis_config] = lambda: redis_config # limiter.enabled = True # limiter.reset() app.testing = True @@ -37,6 +39,8 @@ async def httpxclient() -> AsyncGenerator[AsyncClient, None]: yield client await client.aclose() + app.dependency_overrides.clear() + @pytest.fixture() def no_limit(): @@ -92,9 +96,11 @@ def mturk_event_body_record( @pytest.fixture() -def clean_mturk_events_redis_stream(redis: redis.Redis): - redis.xtrim(JB_EVENTS_STREAM, maxlen=0) - assert redis.xlen(JB_EVENTS_STREAM) == 0 +def clean_mturk_events_redis_stream(redis_config: RedisConfig): + redis_client = redis_config.create_redis_client() + + redis_client.xtrim(JB_EVENTS_STREAM, maxlen=0) + assert redis_client.xlen(JB_EVENTS_STREAM) == 0 yield - redis.xtrim(JB_EVENTS_STREAM, maxlen=0) - assert redis.xlen(JB_EVENTS_STREAM) == 0 + redis_client.xtrim(JB_EVENTS_STREAM, maxlen=0) + assert redis_client.xlen(JB_EVENTS_STREAM) == 0 |