Forces all tests to use the same connection pool without keepalive

Author: Daverball

pyproject.toml

@@ -4,7 +4,6 @@ build-backend = "setuptools.build_meta"
 
 [tool.pytest.ini_options]
 log_level = "INFO"
-redis_timeout = 0
 testpaths = ["tests"]
 python_classes = []
 python_files = ["test_*.py"]

tests/shared/fixtures.py

@@ -24,7 +24,7 @@
 from playwright.sync_api import sync_playwright
 from pytest_localserver.smtp import Server as SmtpServer  # type: ignore[import-untyped]
 from pytest_redis.factories.proc import redis_proc
-from redis import Redis
+from redis import ConnectionPool, Redis
 from shutil import which
 from sqlalchemy import create_engine, exc, text
 from sqlalchemy.orm.session import close_all_sessions
@@ -404,17 +404,28 @@ def browser(playwright_browser: Browser) -> Iterator[ExtendedBrowser]:
         context.close()
 
 
+@pytest.fixture(scope="session")
+def redis_url_session(redis_server: RedisExecutor) -> str:
+    return f'redis://{redis_server.host}:{redis_server.port}/0'
+
+@pytest.fixture(scope="session")
+def redis_pool(
+    redis_url_session: str,
+    monkeysession: pytest.MonkeyPatch
+) -> Iterator[ConnectionPool]:
+    pool = ConnectionPool.from_url(redis_url_session, socket_keepalive=False)
+    monkeysession.setattr('onegov.core.cache.redis.get_pool', lambda url: pool)
+    yield pool
+    pool.close()
+
+
 @pytest.fixture(scope="function")
-def redis_url(redis_server: RedisExecutor) -> Iterator[str]:
-    url = f'redis://{redis_server.host}:{redis_server.port}/0'
-    yield url
-    # disable any potentially resource hungry options and make sure
-    # we clean up our connection after we're done
-    with Redis.from_url(
-        url,
-        socket_keepalive=False,
-        single_connection_client=True,
-    ) as client:
+def redis_url(
+    redis_url_session: str,
+    redis_pool: ConnectionPool
+) -> Iterator[str]:
+    yield redis_url_session
+    with Redis(connection_pool=redis_pool) as client:
         client.flushall()