Skip to content
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.

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

Fix reconfigure_confirm logic in madvr config flow #127216

Merged
merged 1 commit into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions homeassistant/components/madvr/config_flow.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Config flow for the integration."""

import asyncio
from collections.abc import Mapping
import logging
from typing import Any

Expand Down Expand Up @@ -41,17 +42,17 @@ async def async_step_user(
return await self._handle_config_step(user_input)

async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
self, entry_data: Mapping[str, Any]
) -> ConfigFlowResult:
"""Handle reconfiguration of the device."""
self.entry = self.hass.config_entries.async_get_entry(self.context["entry_id"])
return await self.async_step_reconfigure_confirm(user_input)
return await self.async_step_reconfigure_confirm()

async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
return await self._handle_config_step(user_input, step_id="reconfigure")
return await self._handle_config_step(user_input, step_id="reconfigure_confirm")

async def _handle_config_step(
self, user_input: dict[str, Any] | None = None, step_id: str = "user"
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/madvr/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"port": "The port your madVR Envy is listening on. In 99% of cases, leave this as the default."
}
},
"reconfigure": {
"reconfigure_confirm": {
"title": "Reconfigure madVR Envy",
"description": "Your device needs to be on in order to reconfigure the integation.",
"data": {
Expand Down
4 changes: 2 additions & 2 deletions tests/components/madvr/test_config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ async def test_reconfigure_flow(
)

assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure"
assert result["step_id"] == "reconfigure_confirm"
assert result["errors"] == {}

# define new host
Expand Down Expand Up @@ -213,7 +213,7 @@ async def test_reconfigure_flow_errors(
)

assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure"
assert result["step_id"] == "reconfigure_confirm"

# Test CannotConnect error
mock_madvr_client.open_connection.side_effect = TimeoutError
Expand Down