Tries a less invasive approach

Author: Daverball

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 ConnectionPool, Redis
+from redis import Redis
 from shutil import which
 from sqlalchemy import create_engine, exc, text
 from sqlalchemy.orm.session import close_all_sessions
@@ -405,30 +405,17 @@ def browser(playwright_browser: Browser) -> Iterator[ExtendedBrowser]:
 
 
 @pytest.fixture(scope="function")
-def redis_pool(
-    redis_server: RedisExecutor,
-    monkeypatch: pytest.MonkeyPatch
-) -> Iterator[ConnectionPool]:
-
+def redis_url(redis_server: RedisExecutor) -> Iterator[str]:
     import onegov.core.cache.redis as redis_cache
-
     url = f'redis://{redis_server.host}:{redis_server.port}/0'
-    pool = ConnectionPool.from_url(url)
-    pool._redis_url = url  # type: ignore[attr-defined]
-    monkeypatch.setattr(redis_cache, 'get_pool', lambda url: pool)
-    # only cache redis cache region per test case
-    monkeypatch.setattr(redis_cache, 'get', lru_cache(maxsize=1024)(
-        redis_cache.get.__wrapped__))
-    yield pool
-    pool.close()
-
-
-@pytest.fixture(scope="function")
-def redis_url(redis_pool: ConnectionPool) -> Iterator[str]:
-    yield redis_pool._redis_url  # type: ignore[attr-defined]
-    with Redis.from_pool(redis_pool) as client:
+    yield url
+    with Redis.from_url(url) as client:
         client.flushall()
 
+    # clear the cached connection pools, so they can be gc'd
+    redis_cache.get_pool.cache_clear()
+    redis_cache.get.cache_clear()
+
 
 @pytest.fixture(scope="session")
 def glauth_binary() -> str: