π The fast, Pythonic way to build MCP servers and clients.
Remove obsolete Docket memory fixtures (#4912)
Tyce Herrmaned7480b45eaf
diff --git a/tests/client/transports/test_memory_transport.py b/tests/client/transports/test_memory_transport.pyindex 5153ecbf4..51d45325c 100644--- a/tests/client/transports/test_memory_transport.py+++ b/tests/client/transports/test_memory_transport.py@@ -7,7 +7,6 @@ Client(server) with an in-process FastMCP server.import timeimport pytest-from docket import Docketfrom fastmcp import Client, FastMCPfrom fastmcp.client.transports import FastMCPTransport@@ -21,18 +20,8 @@ def test_transport_repr_includes_server_name():assert repr(transport) == "<FastMCPTransport(server='repr-test')>"-def reset_docket_memory_server():- """Force a fresh memory:// Docket server bound to this test's loop."""- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")- yield- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")--@pytest.mark.timeout(10)-async def test_task_teardown_does_not_hang(reset_docket_memory_server):+async def test_task_teardown_does_not_hang():"""In-memory transport must tear down in under 2 seconds after a task call.This is a regression test for a teardown ordering bug where the Docketdiff --git a/tests/server/http/test_http_dependencies.py b/tests/server/http/test_http_dependencies.pyindex 36be3de6b..99d7a379c 100644--- a/tests/server/http/test_http_dependencies.py+++ b/tests/server/http/test_http_dependencies.py@@ -1,7 +1,6 @@import jsonimport pytest-from docket import Docketfrom fastmcp_tasks.context import _recall_snapshot, get_task_contextfrom mcp_types import TextContent, TextResourceContentsfrom starlette.requests import Request@@ -14,16 +13,6 @@ from fastmcp_tasks import TasksExtensionfrom tests.tasks.task_helpers import running_task_server, submit_task, wait_for_task-def reset_docket_memory_server():- """Force a fresh memory:// Docket server bound to this test's event loop."""- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")- yield- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")--def _http_request_with_headers(headers: dict[str, str]) -> Request:"""Build a minimal Starlette HTTP request carrying the given headers."""raw_headers = [(k.lower().encode(), v.encode()) for k, v in headers.items()]@@ -246,9 +235,7 @@ def _worker_snapshot_headers() -> dict[str, str]:return dict(snapshot.http_headers)-async def test_background_task_can_read_snapshotted_request_headers(- reset_docket_memory_server,-):+async def test_background_task_can_read_snapshotted_request_headers():"""A background task worker reads the HTTP headers snapshotted at submission.There is no client task-submission API yet (Phase 4), so the task is driven@@ -278,9 +265,7 @@ async def test_background_task_can_read_snapshotted_request_headers(assert final.result["structuredContent"] == {"result": "tenant-123"}-async def test_background_task_snapshot_preserves_all_request_headers(- reset_docket_memory_server,-):+async def test_background_task_snapshot_preserves_all_request_headers():"""The task snapshot preserves every request header, including authorization."""server = FastMCP()server.add_extension(TasksExtension())diff --git a/tests/server/mount/test_advanced.py b/tests/server/mount/test_advanced.pyindex 24c9765cd..0450dec70 100644--- a/tests/server/mount/test_advanced.py+++ b/tests/server/mount/test_advanced.py@@ -1,7 +1,6 @@"""Advanced mounting scenarios."""import pytest-from docket import Docketfrom mcp_types import TextContentfrom starlette.routing import Route@@ -13,16 +12,6 @@ from fastmcp_tasks import TasksExtensionfrom tests.tasks.task_helpers import running_task_server-def reset_docket_memory_server():- """Force a fresh memory:// Docket server bound to this test's event loop."""- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")- yield- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")--class TestDynamicChanges:"""Test that changes to mounted servers are reflected dynamically."""@@ -611,9 +600,7 @@ class TestMountedServerDocketBehavior:includes Docket creation."""- async def test_mounted_server_does_not_have_docket(- self, reset_docket_memory_server- ):+ async def test_mounted_server_does_not_have_docket(self):"""Test that a mounted server doesn't create its own Docket.MountedProvider.lifespan() should call only the server's _lifespandiff --git a/tests/server/test_dependencies.py b/tests/server/test_dependencies.pyindex cef7cbf45..35958f09e 100644--- a/tests/server/test_dependencies.py+++ b/tests/server/test_dependencies.py@@ -3,7 +3,6 @@from contextlib import asynccontextmanager, contextmanagerimport pytest-from docket import Docketfrom mcp_types import TextContent, TextResourceContentsfrom fastmcp import FastMCP@@ -16,16 +15,6 @@ from tests.conftest import make_server_request_contextHUZZAH = "huzzah!"-def reset_docket_memory_server():- """Force a fresh memory:// Docket server bound to this test's event loop."""- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")- yield- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")--class Connection:"""Test connection that tracks whether it's currently open."""@@ -1205,9 +1194,7 @@ class TestSharedDependencies:)assert call_count == 1- async def test_shared_resolves_on_task_capable_server(- self, reset_docket_memory_server- ):+ async def test_shared_resolves_on_task_capable_server(self):"""Shared() dependencies resolve on a normal request even when the serverhas task-enabled components.diff --git a/tests/server/test_mrtr_guards.py b/tests/server/test_mrtr_guards.pyindex f9af66656..099a4a042 100644--- a/tests/server/test_mrtr_guards.py+++ b/tests/server/test_mrtr_guards.py@@ -22,7 +22,6 @@ from typing import Annotatedimport mcp_typesimport pytest-from docket import Docketfrom mcp.client._input_required import InputRequiredRoundsExceededErrorfrom mcp.server.request_state import RequestStateSecurityfrom mcp.shared.exceptions import MCPError@@ -1177,18 +1176,7 @@ class TestTaskExecution:background task has no such request, so returning a guard result from a taskis rejected with a clear error rather than silently yielding empty content."""- @pytest.fixture- def reset_docket_memory_server(self):- """Force a fresh memory:// Docket server bound to this test's loop."""- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")- yield- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")-- async def test_guard_result_from_task_parks_for_input(- self, reset_docket_memory_server- ):+ async def test_guard_result_from_task_parks_for_input(self):mcp = FastMCP("guard-task")mcp.add_extension(TasksExtension())diff --git a/tests/server/test_server_docket.py b/tests/server/test_server_docket.pyindex bd4834b55..7bd83d1e7 100644--- a/tests/server/test_server_docket.py+++ b/tests/server/test_server_docket.py@@ -3,7 +3,6 @@import asynciofrom contextlib import asynccontextmanager-import pytestfrom docket import Docketfrom docket.worker import Workerfrom fastmcp_tasks.dependencies import CurrentDocket, CurrentWorker@@ -16,16 +15,6 @@ from fastmcp_tasks import TasksExtensionHUZZAH = "huzzah!"[email protected](autouse=True)-def reset_docket_memory_server():- """Force a fresh memory:// Docket server bound to each test's event loop."""- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")- yield- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")--async def test_docket_not_initialized_without_task_components():"""Docket is only initialized when task-enabled components exist."""mcp = FastMCP("test-server")diff --git a/tests/tasks/server/conftest.py b/tests/tasks/server/conftest.pyindex b1dc7f98a..70ea6754b 100644--- a/tests/tasks/server/conftest.py+++ b/tests/tasks/server/conftest.py@@ -8,26 +8,6 @@ import pytestfrom fastmcp.utilities.tests import temporary_settings[email protected](autouse=True)-def reset_docket_memory_server():- """Reset the shared memory:// Docket server between tests.-- Docket keeps a process-wide ``Docket._memory_server`` singleton for- ``memory://`` backends. It persists across tests and across event loops, so a- test that inherits a stale server from a previous loop can fail (e.g.- ``tasks/get`` raising ``TypeError`` from the dead client). Clearing it before- and after each test keeps the task suite isolation-safe rather than- order-dependent.- """- from docket import Docket-- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")- yield- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")--@pytest.fixture(autouse=True)def isolate_settings_home(_settings_home_root: Path):"""Task-local override of the repo-wide ``isolate_settings_home`` fixture.diff --git a/tests/tasks/server/test_task_mount.py b/tests/tasks/server/test_task_mount.pyindex df8f23deb..8b8f4dae5 100644--- a/tests/tasks/server/test_task_mount.py+++ b/tests/tasks/server/test_task_mount.py@@ -44,16 +44,6 @@ from tests.tasks.task_helpers import ()[email protected](autouse=True)-def reset_docket_memory_server():- """Reset the shared memory:// Docket server between tests for isolation."""- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")- yield- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")--@pytest.fixturedef child_server() -> FastMCP:mcp = FastMCP("child-server")diff --git a/tests/tasks/server/test_task_proxy.py b/tests/tasks/server/test_task_proxy.pyindex 078e48894..a7049308a 100644--- a/tests/tasks/server/test_task_proxy.py+++ b/tests/tasks/server/test_task_proxy.py@@ -8,7 +8,6 @@ client opts the tasks extension in for the request."""import pytest-from docket import Docketfrom fastmcp_tasks.models import CreateTaskResultfrom fastmcp import FastMCP@@ -24,16 +23,6 @@ from tests.tasks.task_helpers import ()[email protected](autouse=True)-def reset_docket_memory_server():- """Force a fresh memory:// Docket server bound to each test's event loop."""- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")- yield- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")--async def call_tool_with_optin(server: FastMCP, name: str, arguments: dict):"""Run a `tools/call` with the tasks opt-in bound into the request context."""with auth_scope(None), _opted_in_request(name, arguments, None):diff --git a/tests/tasks/server/test_task_return_types.py b/tests/tasks/server/test_task_return_types.pyindex eb65fabd9..26b646957 100644--- a/tests/tasks/server/test_task_return_types.py+++ b/tests/tasks/server/test_task_return_types.py@@ -16,7 +16,6 @@ from uuid import UUIDimport mcp_typesimport pytest-from docket import Docketfrom pydantic import BaseModelfrom typing_extensions import TypedDict@@ -31,16 +30,6 @@ from tests.tasks.task_helpers import ()[email protected](autouse=True)-def reset_docket_memory_server():- """Force a fresh memory:// Docket server bound to each test's event loop."""- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")- yield- if hasattr(Docket, "_memory_server"):- delattr(Docket, "_memory_server")--def _sync_result_to_wire(result: ToolResult) -> dict[str, Any]:"""Serialize a synchronous ToolResult into the inlined task wire shape."""mcp_result = result.to_mcp_result()