Skip to content

Fix flaky mcp_server tests with Python 3.14.3 #169385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allenporter merged 3 commits into from
Apr 29, 2026
Merged

Fix flaky mcp_server tests with Python 3.14.3 #169385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2eee2d2
Fix flaky mcp_server tests with Python 3.14.3
epenet Apr 28, 2026
e3583b6
Improve docstring for Home Assistant fixture
epenet Apr 28, 2026
f3acae6
Remove homeassistant from manifest
epenet Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion homeassistant/components/mcp_server/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Model Context Protocol Server",
"codeowners": ["@allenporter"],
"config_flow": true,
"dependencies": ["homeassistant", "http", "conversation"],
"dependencies": ["http", "conversation"],
Copy link
Copy Markdown
Contributor Author

@epenet epenet Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In production, "homeassistant" is always loaded first. It doesn't not need to be present in dependencies so I have removed it.

core/homeassistant/bootstrap.py

Line 147 in f3acae6

CORE_INTEGRATIONS = {"homeassistant", "persistent_notification"}

"documentation": "https://www.home-assistant.io/integrations/mcp_server",
"integration_type": "service",
"iot_class": "local_push",
Expand Down
7 changes: 7 additions & 0 deletions tests/components/mcp_server/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,17 @@
from homeassistant.const import CONF_LLM_HASS_API
from homeassistant.core import HomeAssistant
from homeassistant.helpers import llm
from homeassistant.setup import async_setup_component

from tests.common import MockConfigEntry


@pytest.fixture(autouse=True)
async def ensure_homeassistant_loaded(hass: HomeAssistant) -> None:
"""Ensure homeassistant component is loaded."""
assert await async_setup_component(hass, "homeassistant", {})


@pytest.fixture
def mock_setup_entry() -> Generator[AsyncMock]:
"""Override async_setup_entry."""
Expand Down