From b3001c1e5a5d5d5b2a04daf4a7445023f24806d5 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Thu, 16 Apr 2026 20:41:58 -0700 Subject: [PATCH] Drop redundant _ds_client global now that ds_client is session-scoped Session-scoped fixtures are cached per worker by pytest itself, so the manual _ds_client module global is no longer needed. Refs #2692 Co-Authored-By: Claude Opus 4.7 (1M context) --- tests/conftest.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 171a5433..5f1cc587 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -28,9 +28,6 @@ UNDOCUMENTED_PERMISSIONS = { "view_document", } -_ds_client = None - - def wait_until_responds(url, timeout=5.0, client=httpx, **kwargs): start = time.time() while time.time() - start < timeout: @@ -60,10 +57,6 @@ async def ds_client(): from .fixtures import CONFIG, METADATA, PLUGINS_DIR import secrets - global _ds_client - if _ds_client is not None: - return _ds_client - ds = Datasette( metadata=METADATA, config=CONFIG, @@ -95,8 +88,7 @@ async def ds_client(): await db.execute_write_fn(prepare) await ds.invoke_startup() - _ds_client = ds.client - return _ds_client + return ds.client def pytest_report_header(config):