From 4b88a71d60d3886db7105a547841b4513dd27bea Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Tue, 24 Jan 2023 13:05:17 -0500 Subject: [PATCH] Re-enable multi-PAN (#86533) Revert "Disable multi-pan (#83603)" This reverts commit 9c7b80090a1d4537282400b8f533c5d48a144948. --- .../silabs_multiprotocol_addon.py | 10 +--------- .../components/homeassistant_hardware/strings.json | 3 +-- .../homeassistant_hardware/translations/en.json | 1 - .../components/homeassistant_sky_connect/strings.json | 3 +-- .../homeassistant_sky_connect/translations/en.json | 1 - .../components/homeassistant_yellow/strings.json | 3 +-- .../homeassistant_yellow/translations/en.json | 1 - .../test_silabs_multiprotocol_addon.py | 3 --- .../homeassistant_sky_connect/test_config_flow.py | 4 ---- .../homeassistant_yellow/test_config_flow.py | 4 ---- 10 files changed, 4 insertions(+), 29 deletions(-) diff --git a/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py b/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py index a84200e43d6..20fdb97e384 100644 --- a/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py +++ b/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py @@ -236,15 +236,7 @@ class OptionsFlowHandler(BaseMultiPanFlow, config_entries.OptionsFlow): if not is_hassio(self.hass): return self.async_abort(reason="not_hassio") - return self.async_abort( - reason="disabled_due_to_bug", - description_placeholders={ - "url": "https://developers.home-assistant.io/blog/2022/12/08/multi-pan-rollback" - }, - ) - - # pylint: disable-next=unreachable - return await self.async_step_on_supervisor() # type: ignore[unreachable] + return await self.async_step_on_supervisor() async def async_step_on_supervisor( self, user_input: dict[str, Any] | None = None diff --git a/homeassistant/components/homeassistant_hardware/strings.json b/homeassistant/components/homeassistant_hardware/strings.json index 819ec38925f..47549794fc8 100644 --- a/homeassistant/components/homeassistant_hardware/strings.json +++ b/homeassistant/components/homeassistant_hardware/strings.json @@ -32,8 +32,7 @@ "addon_set_config_failed": "Failed to set Silicon Labs Multiprotocol configuration.", "addon_start_failed": "Failed to start the Silicon Labs Multiprotocol add-on.", "not_hassio": "The hardware options can only be configured on HassOS installations.", - "zha_migration_failed": "The ZHA migration did not succeed.", - "disabled_due_to_bug": "The hardware options are temporarily disabled while we fix a bug. [Learn more]({url})" + "zha_migration_failed": "The ZHA migration did not succeed." }, "progress": { "install_addon": "Please wait while the Silicon Labs Multiprotocol add-on installation finishes. This can take several minutes.", diff --git a/homeassistant/components/homeassistant_hardware/translations/en.json b/homeassistant/components/homeassistant_hardware/translations/en.json index 2d2e59c30fa..ec75e234c4d 100644 --- a/homeassistant/components/homeassistant_hardware/translations/en.json +++ b/homeassistant/components/homeassistant_hardware/translations/en.json @@ -6,7 +6,6 @@ "addon_install_failed": "Failed to install the Silicon Labs Multiprotocol add-on.", "addon_set_config_failed": "Failed to set Silicon Labs Multiprotocol configuration.", "addon_start_failed": "Failed to start the Silicon Labs Multiprotocol add-on.", - "disabled_due_to_bug": "The hardware options are temporarily disabled while we fix a bug. [Learn more]({url})", "not_hassio": "The hardware options can only be configured on HassOS installations.", "zha_migration_failed": "The ZHA migration did not succeed." }, diff --git a/homeassistant/components/homeassistant_sky_connect/strings.json b/homeassistant/components/homeassistant_sky_connect/strings.json index d18d2620318..970f9d97a4c 100644 --- a/homeassistant/components/homeassistant_sky_connect/strings.json +++ b/homeassistant/components/homeassistant_sky_connect/strings.json @@ -31,8 +31,7 @@ "addon_set_config_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::addon_set_config_failed%]", "addon_start_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::addon_start_failed%]", "not_hassio": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::not_hassio%]", - "zha_migration_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::zha_migration_failed%]", - "disabled_due_to_bug": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::disabled_due_to_bug%]" + "zha_migration_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::zha_migration_failed%]" }, "progress": { "install_addon": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::progress::install_addon%]", diff --git a/homeassistant/components/homeassistant_sky_connect/translations/en.json b/homeassistant/components/homeassistant_sky_connect/translations/en.json index 0631d74db75..8e12173f86a 100644 --- a/homeassistant/components/homeassistant_sky_connect/translations/en.json +++ b/homeassistant/components/homeassistant_sky_connect/translations/en.json @@ -5,7 +5,6 @@ "addon_install_failed": "Failed to install the Silicon Labs Multiprotocol add-on.", "addon_set_config_failed": "Failed to set Silicon Labs Multiprotocol configuration.", "addon_start_failed": "Failed to start the Silicon Labs Multiprotocol add-on.", - "disabled_due_to_bug": "The hardware options are temporarily disabled while we fix a bug. [Learn more]({url})", "not_hassio": "The hardware options can only be configured on HassOS installations.", "zha_migration_failed": "The ZHA migration did not succeed." }, diff --git a/homeassistant/components/homeassistant_yellow/strings.json b/homeassistant/components/homeassistant_yellow/strings.json index d18d2620318..970f9d97a4c 100644 --- a/homeassistant/components/homeassistant_yellow/strings.json +++ b/homeassistant/components/homeassistant_yellow/strings.json @@ -31,8 +31,7 @@ "addon_set_config_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::addon_set_config_failed%]", "addon_start_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::addon_start_failed%]", "not_hassio": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::not_hassio%]", - "zha_migration_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::zha_migration_failed%]", - "disabled_due_to_bug": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::disabled_due_to_bug%]" + "zha_migration_failed": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::abort::zha_migration_failed%]" }, "progress": { "install_addon": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::progress::install_addon%]", diff --git a/homeassistant/components/homeassistant_yellow/translations/en.json b/homeassistant/components/homeassistant_yellow/translations/en.json index 0631d74db75..8e12173f86a 100644 --- a/homeassistant/components/homeassistant_yellow/translations/en.json +++ b/homeassistant/components/homeassistant_yellow/translations/en.json @@ -5,7 +5,6 @@ "addon_install_failed": "Failed to install the Silicon Labs Multiprotocol add-on.", "addon_set_config_failed": "Failed to set Silicon Labs Multiprotocol configuration.", "addon_start_failed": "Failed to start the Silicon Labs Multiprotocol add-on.", - "disabled_due_to_bug": "The hardware options are temporarily disabled while we fix a bug. [Learn more]({url})", "not_hassio": "The hardware options can only be configured on HassOS installations.", "zha_migration_failed": "The ZHA migration did not succeed." }, diff --git a/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py b/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py index 0d703b04bfb..abe66d35a96 100644 --- a/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py +++ b/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py @@ -20,9 +20,6 @@ from tests.common import MockConfigEntry, MockModule, mock_integration, mock_pla TEST_DOMAIN = "test" -pytest.skip(reason="Temporarily disabled", allow_module_level=True) - - class TestConfigFlow(ConfigFlow, domain=TEST_DOMAIN): """Handle a config flow for the silabs multiprotocol add-on.""" diff --git a/tests/components/homeassistant_sky_connect/test_config_flow.py b/tests/components/homeassistant_sky_connect/test_config_flow.py index 5aad0061674..6ef3d13636e 100644 --- a/tests/components/homeassistant_sky_connect/test_config_flow.py +++ b/tests/components/homeassistant_sky_connect/test_config_flow.py @@ -2,8 +2,6 @@ import copy from unittest.mock import Mock, patch -import pytest - from homeassistant.components import homeassistant_sky_connect, usb from homeassistant.components.homeassistant_sky_connect.const import DOMAIN from homeassistant.components.zha.core.const import ( @@ -152,7 +150,6 @@ async def test_config_flow_update_device(hass: HomeAssistant) -> None: assert len(mock_unload_entry.mock_calls) == 1 -@pytest.mark.skip(reason="Temporarily disabled") async def test_option_flow_install_multi_pan_addon( hass: HomeAssistant, addon_store_info, @@ -243,7 +240,6 @@ def mock_detect_radio_type(radio_type=RadioType.ezsp, ret=True): return detect -@pytest.mark.skip(reason="Temporarily disabled") @patch( "homeassistant.components.zha.radio_manager.ZhaRadioManager.detect_radio_type", mock_detect_radio_type(), diff --git a/tests/components/homeassistant_yellow/test_config_flow.py b/tests/components/homeassistant_yellow/test_config_flow.py index 3d846501524..53d1c5e974d 100644 --- a/tests/components/homeassistant_yellow/test_config_flow.py +++ b/tests/components/homeassistant_yellow/test_config_flow.py @@ -1,8 +1,6 @@ """Test the Home Assistant Yellow config flow.""" from unittest.mock import Mock, patch -import pytest - from homeassistant.components.homeassistant_yellow.const import DOMAIN from homeassistant.components.zha.core.const import DOMAIN as ZHA_DOMAIN from homeassistant.core import HomeAssistant @@ -61,7 +59,6 @@ async def test_config_flow_single_entry(hass: HomeAssistant) -> None: mock_setup_entry.assert_not_called() -@pytest.mark.skip(reason="Temporarily disabled") async def test_option_flow_install_multi_pan_addon( hass: HomeAssistant, addon_store_info, @@ -130,7 +127,6 @@ async def test_option_flow_install_multi_pan_addon( assert result["type"] == FlowResultType.CREATE_ENTRY -@pytest.mark.skip(reason="Temporarily disabled") async def test_option_flow_install_multi_pan_addon_zha( hass: HomeAssistant, addon_store_info,