From c19b222d5a5ab1797d045e6edeaf497bfcbac5ef Mon Sep 17 00:00:00 2001 From: Robert Svensson Date: Fri, 8 May 2020 18:51:10 +0200 Subject: [PATCH] UniFi - Catch wlan_override without name key (#35366) --- homeassistant/components/unifi/config_flow.py | 1 + tests/components/unifi/test_config_flow.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/homeassistant/components/unifi/config_flow.py b/homeassistant/components/unifi/config_flow.py index a4382c59ee3..5e4268f2250 100644 --- a/homeassistant/components/unifi/config_flow.py +++ b/homeassistant/components/unifi/config_flow.py @@ -240,6 +240,7 @@ class UnifiOptionsFlowHandler(config_entries.OptionsFlow): wlan["name"] for ap in self.controller.api.devices.values() for wlan in ap.wlan_overrides + if "name" in wlan } ) ssid_filter = {ssid: ssid for ssid in sorted(list(ssids))} diff --git a/tests/components/unifi/test_config_flow.py b/tests/components/unifi/test_config_flow.py index 75cce392156..7487e9d341b 100644 --- a/tests/components/unifi/test_config_flow.py +++ b/tests/components/unifi/test_config_flow.py @@ -50,6 +50,17 @@ DEVICES = [ "radio_name": "wifi1", "wlan_id": "012345678910111213141516", }, + { + "name": "", + "radio": "na", + "radio_name": "wifi1", + "wlan_id": "012345678910111213141516", + }, + { + "radio": "na", + "radio_name": "wifi1", + "wlan_id": "012345678910111213141516", + }, ], } ] @@ -349,6 +360,9 @@ async def test_advanced_option_flow(hass): assert result["type"] == data_entry_flow.RESULT_TYPE_FORM assert result["step_id"] == "device_tracker" + assert set( + result["data_schema"].schema[CONF_SSID_FILTER].options.keys() + ).intersection(("SSID 1", "SSID 2", "SSID 2_IOT", "SSID 3")) result = await hass.config_entries.options.async_configure( result["flow_id"],