Skip to content

Commit cd16fd0

Browse files
committed
refactor(test): consolidate MakeContext type alias into conftest
Move the duplicated MakeContext type alias from test_multi_tenancy_managers.py and test_resource_manager.py into conftest.py as the single source of truth. Github-Issue:#8
1 parent 424598e commit cd16fd0

3 files changed

Lines changed: 5 additions & 12 deletions

File tree

tests/server/mcpserver/conftest.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55

66
from mcp.server.mcpserver.context import Context
77

8+
MakeContext = Callable[..., Context[Any, Any]]
9+
810

911
@pytest.fixture
10-
def make_context() -> Callable[..., Context[Any, Any]]:
12+
def make_context() -> MakeContext:
1113
"""Factory fixture for creating Context instances in tests.
1214
1315
Centralizes Context construction so that tests don't break if the

tests/server/mcpserver/resources/test_resource_manager.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
from collections.abc import Callable
21
from pathlib import Path
32
from tempfile import NamedTemporaryFile
4-
from typing import Any
53

64
import pytest
75
from pydantic import AnyUrl
86

9-
from mcp.server.mcpserver.context import Context
107
from mcp.server.mcpserver.resources import FileResource, FunctionResource, ResourceManager
11-
12-
MakeContext = Callable[..., Context[Any, Any]]
8+
from tests.server.mcpserver.conftest import MakeContext
139

1410

1511
@pytest.fixture

tests/server/mcpserver/test_multi_tenancy_managers.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
"""Tests for tenant-scoped storage in ToolManager, ResourceManager, and PromptManager."""
22

3-
from collections.abc import Callable
4-
from typing import Any
5-
63
import pytest
74

8-
from mcp.server.mcpserver.context import Context
95
from mcp.server.mcpserver.exceptions import ToolError
106
from mcp.server.mcpserver.prompts.base import Prompt
117
from mcp.server.mcpserver.prompts.manager import PromptManager
128
from mcp.server.mcpserver.resources.resource_manager import ResourceManager
139
from mcp.server.mcpserver.resources.types import FunctionResource
1410
from mcp.server.mcpserver.tools import ToolManager
15-
16-
MakeContext = Callable[..., Context[Any, Any]]
11+
from tests.server.mcpserver.conftest import MakeContext
1712

1813
# --- ToolManager ---
1914

0 commit comments

Comments
 (0)