mirror of
https://github.com/home-assistant/core.git
synced 2025-07-27 15:17:35 +00:00
Fix creating unique IDs for WiFi switches in Fritz!Tools (#73183)
This commit is contained in:
parent
eca6768016
commit
8c34067f17
@ -169,7 +169,16 @@ def wifi_entities_list(
|
|||||||
}
|
}
|
||||||
for i, network in networks.copy().items():
|
for i, network in networks.copy().items():
|
||||||
networks[i]["switch_name"] = network["ssid"]
|
networks[i]["switch_name"] = network["ssid"]
|
||||||
if len([j for j, n in networks.items() if n["ssid"] == network["ssid"]]) > 1:
|
if (
|
||||||
|
len(
|
||||||
|
[
|
||||||
|
j
|
||||||
|
for j, n in networks.items()
|
||||||
|
if slugify(n["ssid"]) == slugify(network["ssid"])
|
||||||
|
]
|
||||||
|
)
|
||||||
|
> 1
|
||||||
|
):
|
||||||
networks[i]["switch_name"] += f" ({WIFI_STANDARD[i]})"
|
networks[i]["switch_name"] += f" ({WIFI_STANDARD[i]})"
|
||||||
|
|
||||||
_LOGGER.debug("WiFi networks list: %s", networks)
|
_LOGGER.debug("WiFi networks list: %s", networks)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
"""Common stuff for AVM Fritz!Box tests."""
|
"""Common stuff for Fritz!Tools tests."""
|
||||||
import logging
|
import logging
|
||||||
from unittest.mock import MagicMock, patch
|
from unittest.mock import MagicMock, patch
|
||||||
|
|
||||||
@ -73,13 +73,19 @@ class FritzHostMock(FritzHosts):
|
|||||||
return MOCK_MESH_DATA
|
return MOCK_MESH_DATA
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture(name="fc_data")
|
||||||
|
def fc_data_mock():
|
||||||
|
"""Fixture for default fc_data."""
|
||||||
|
return MOCK_FB_SERVICES
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture()
|
@pytest.fixture()
|
||||||
def fc_class_mock():
|
def fc_class_mock(fc_data):
|
||||||
"""Fixture that sets up a mocked FritzConnection class."""
|
"""Fixture that sets up a mocked FritzConnection class."""
|
||||||
with patch(
|
with patch(
|
||||||
"homeassistant.components.fritz.common.FritzConnection", autospec=True
|
"homeassistant.components.fritz.common.FritzConnection", autospec=True
|
||||||
) as result:
|
) as result:
|
||||||
result.return_value = FritzConnectionMock(MOCK_FB_SERVICES)
|
result.return_value = FritzConnectionMock(fc_data)
|
||||||
yield result
|
yield result
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
"""Common stuff for AVM Fritz!Box tests."""
|
"""Common stuff for Fritz!Tools tests."""
|
||||||
from homeassistant.components import ssdp
|
from homeassistant.components import ssdp
|
||||||
from homeassistant.components.fritz.const import DOMAIN
|
from homeassistant.components.fritz.const import DOMAIN
|
||||||
from homeassistant.components.ssdp import ATTR_UPNP_FRIENDLY_NAME, ATTR_UPNP_UDN
|
from homeassistant.components.ssdp import ATTR_UPNP_FRIENDLY_NAME, ATTR_UPNP_UDN
|
||||||
@ -194,6 +194,7 @@ MOCK_FB_SERVICES: dict[str, dict] = {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
MOCK_MESH_DATA = {
|
MOCK_MESH_DATA = {
|
||||||
"schema_version": "1.9",
|
"schema_version": "1.9",
|
||||||
"nodes": [
|
"nodes": [
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
"""Tests for Shelly button platform."""
|
"""Tests for Fritz!Tools button platform."""
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
"""Tests for AVM Fritz!Box config flow."""
|
"""Tests for Fritz!Tools config flow."""
|
||||||
import dataclasses
|
import dataclasses
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
"""Tests for the AVM Fritz!Box integration."""
|
"""Tests for Fritz!Tools diagnostics platform."""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from aiohttp import ClientSession
|
from aiohttp import ClientSession
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
"""Tests for AVM Fritz!Box."""
|
"""Tests for Fritz!Tools."""
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
from fritzconnection.core.exceptions import FritzSecurityError
|
from fritzconnection.core.exceptions import FritzSecurityError
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
"""Tests for Shelly button platform."""
|
"""Tests for Fritz!Tools sensor platform."""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
|
189
tests/components/fritz/test_switch.py
Normal file
189
tests/components/fritz/test_switch.py
Normal file
@ -0,0 +1,189 @@
|
|||||||
|
"""Tests for Fritz!Tools switch platform."""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from homeassistant.components.fritz.const import DOMAIN
|
||||||
|
from homeassistant.config_entries import ConfigEntryState
|
||||||
|
from homeassistant.const import Platform
|
||||||
|
from homeassistant.core import HomeAssistant
|
||||||
|
from homeassistant.setup import async_setup_component
|
||||||
|
|
||||||
|
from .const import MOCK_FB_SERVICES, MOCK_USER_DATA
|
||||||
|
|
||||||
|
from tests.common import MockConfigEntry
|
||||||
|
|
||||||
|
MOCK_WLANCONFIGS_SAME_SSID: dict[str, dict] = {
|
||||||
|
"WLANConfiguration1": {
|
||||||
|
"GetInfo": {
|
||||||
|
"NewEnable": True,
|
||||||
|
"NewStatus": "Up",
|
||||||
|
"NewMaxBitRate": "Auto",
|
||||||
|
"NewChannel": 13,
|
||||||
|
"NewSSID": "WiFi",
|
||||||
|
"NewBeaconType": "11iandWPA3",
|
||||||
|
"NewX_AVM-DE_PossibleBeaconTypes": "None,11i,11iandWPA3",
|
||||||
|
"NewMACAddressControlEnabled": False,
|
||||||
|
"NewStandard": "ax",
|
||||||
|
"NewBSSID": "1C:ED:6F:12:34:12",
|
||||||
|
"NewBasicEncryptionModes": "None",
|
||||||
|
"NewBasicAuthenticationMode": "None",
|
||||||
|
"NewMaxCharsSSID": 32,
|
||||||
|
"NewMinCharsSSID": 1,
|
||||||
|
"NewAllowedCharsSSID": "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
|
||||||
|
"NewMinCharsPSK": 64,
|
||||||
|
"NewMaxCharsPSK": 64,
|
||||||
|
"NewAllowedCharsPSK": "0123456789ABCDEFabcdef",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"WLANConfiguration2": {
|
||||||
|
"GetInfo": {
|
||||||
|
"NewEnable": True,
|
||||||
|
"NewStatus": "Up",
|
||||||
|
"NewMaxBitRate": "Auto",
|
||||||
|
"NewChannel": 52,
|
||||||
|
"NewSSID": "WiFi",
|
||||||
|
"NewBeaconType": "11iandWPA3",
|
||||||
|
"NewX_AVM-DE_PossibleBeaconTypes": "None,11i,11iandWPA3",
|
||||||
|
"NewMACAddressControlEnabled": False,
|
||||||
|
"NewStandard": "ax",
|
||||||
|
"NewBSSID": "1C:ED:6F:12:34:13",
|
||||||
|
"NewBasicEncryptionModes": "None",
|
||||||
|
"NewBasicAuthenticationMode": "None",
|
||||||
|
"NewMaxCharsSSID": 32,
|
||||||
|
"NewMinCharsSSID": 1,
|
||||||
|
"NewAllowedCharsSSID": "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
|
||||||
|
"NewMinCharsPSK": 64,
|
||||||
|
"NewMaxCharsPSK": 64,
|
||||||
|
"NewAllowedCharsPSK": "0123456789ABCDEFabcdef",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
MOCK_WLANCONFIGS_DIFF_SSID: dict[str, dict] = {
|
||||||
|
"WLANConfiguration1": {
|
||||||
|
"GetInfo": {
|
||||||
|
"NewEnable": True,
|
||||||
|
"NewStatus": "Up",
|
||||||
|
"NewMaxBitRate": "Auto",
|
||||||
|
"NewChannel": 13,
|
||||||
|
"NewSSID": "WiFi",
|
||||||
|
"NewBeaconType": "11iandWPA3",
|
||||||
|
"NewX_AVM-DE_PossibleBeaconTypes": "None,11i,11iandWPA3",
|
||||||
|
"NewMACAddressControlEnabled": False,
|
||||||
|
"NewStandard": "ax",
|
||||||
|
"NewBSSID": "1C:ED:6F:12:34:12",
|
||||||
|
"NewBasicEncryptionModes": "None",
|
||||||
|
"NewBasicAuthenticationMode": "None",
|
||||||
|
"NewMaxCharsSSID": 32,
|
||||||
|
"NewMinCharsSSID": 1,
|
||||||
|
"NewAllowedCharsSSID": "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
|
||||||
|
"NewMinCharsPSK": 64,
|
||||||
|
"NewMaxCharsPSK": 64,
|
||||||
|
"NewAllowedCharsPSK": "0123456789ABCDEFabcdef",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"WLANConfiguration2": {
|
||||||
|
"GetInfo": {
|
||||||
|
"NewEnable": True,
|
||||||
|
"NewStatus": "Up",
|
||||||
|
"NewMaxBitRate": "Auto",
|
||||||
|
"NewChannel": 52,
|
||||||
|
"NewSSID": "WiFi2",
|
||||||
|
"NewBeaconType": "11iandWPA3",
|
||||||
|
"NewX_AVM-DE_PossibleBeaconTypes": "None,11i,11iandWPA3",
|
||||||
|
"NewMACAddressControlEnabled": False,
|
||||||
|
"NewStandard": "ax",
|
||||||
|
"NewBSSID": "1C:ED:6F:12:34:13",
|
||||||
|
"NewBasicEncryptionModes": "None",
|
||||||
|
"NewBasicAuthenticationMode": "None",
|
||||||
|
"NewMaxCharsSSID": 32,
|
||||||
|
"NewMinCharsSSID": 1,
|
||||||
|
"NewAllowedCharsSSID": "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
|
||||||
|
"NewMinCharsPSK": 64,
|
||||||
|
"NewMaxCharsPSK": 64,
|
||||||
|
"NewAllowedCharsPSK": "0123456789ABCDEFabcdef",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
MOCK_WLANCONFIGS_DIFF2_SSID: dict[str, dict] = {
|
||||||
|
"WLANConfiguration1": {
|
||||||
|
"GetInfo": {
|
||||||
|
"NewEnable": True,
|
||||||
|
"NewStatus": "Up",
|
||||||
|
"NewMaxBitRate": "Auto",
|
||||||
|
"NewChannel": 13,
|
||||||
|
"NewSSID": "WiFi",
|
||||||
|
"NewBeaconType": "11iandWPA3",
|
||||||
|
"NewX_AVM-DE_PossibleBeaconTypes": "None,11i,11iandWPA3",
|
||||||
|
"NewMACAddressControlEnabled": False,
|
||||||
|
"NewStandard": "ax",
|
||||||
|
"NewBSSID": "1C:ED:6F:12:34:12",
|
||||||
|
"NewBasicEncryptionModes": "None",
|
||||||
|
"NewBasicAuthenticationMode": "None",
|
||||||
|
"NewMaxCharsSSID": 32,
|
||||||
|
"NewMinCharsSSID": 1,
|
||||||
|
"NewAllowedCharsSSID": "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
|
||||||
|
"NewMinCharsPSK": 64,
|
||||||
|
"NewMaxCharsPSK": 64,
|
||||||
|
"NewAllowedCharsPSK": "0123456789ABCDEFabcdef",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"WLANConfiguration2": {
|
||||||
|
"GetInfo": {
|
||||||
|
"NewEnable": True,
|
||||||
|
"NewStatus": "Up",
|
||||||
|
"NewMaxBitRate": "Auto",
|
||||||
|
"NewChannel": 52,
|
||||||
|
"NewSSID": "WiFi+",
|
||||||
|
"NewBeaconType": "11iandWPA3",
|
||||||
|
"NewX_AVM-DE_PossibleBeaconTypes": "None,11i,11iandWPA3",
|
||||||
|
"NewMACAddressControlEnabled": False,
|
||||||
|
"NewStandard": "ax",
|
||||||
|
"NewBSSID": "1C:ED:6F:12:34:13",
|
||||||
|
"NewBasicEncryptionModes": "None",
|
||||||
|
"NewBasicAuthenticationMode": "None",
|
||||||
|
"NewMaxCharsSSID": 32,
|
||||||
|
"NewMinCharsSSID": 1,
|
||||||
|
"NewAllowedCharsSSID": "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz !\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
|
||||||
|
"NewMinCharsPSK": 64,
|
||||||
|
"NewMaxCharsPSK": 64,
|
||||||
|
"NewAllowedCharsPSK": "0123456789ABCDEFabcdef",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"fc_data, expected_wifi_names",
|
||||||
|
[
|
||||||
|
(
|
||||||
|
{**MOCK_FB_SERVICES, **MOCK_WLANCONFIGS_SAME_SSID},
|
||||||
|
["WiFi (2.4Ghz)", "WiFi (5Ghz)"],
|
||||||
|
),
|
||||||
|
({**MOCK_FB_SERVICES, **MOCK_WLANCONFIGS_DIFF_SSID}, ["WiFi", "WiFi2"]),
|
||||||
|
(
|
||||||
|
{**MOCK_FB_SERVICES, **MOCK_WLANCONFIGS_DIFF2_SSID},
|
||||||
|
["WiFi (2.4Ghz)", "WiFi+ (5Ghz)"],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
async def test_switch_setup(
|
||||||
|
hass: HomeAssistant,
|
||||||
|
expected_wifi_names: list[str],
|
||||||
|
fc_class_mock,
|
||||||
|
fh_class_mock,
|
||||||
|
):
|
||||||
|
"""Test setup of Fritz!Tools switches."""
|
||||||
|
|
||||||
|
entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA)
|
||||||
|
entry.add_to_hass(hass)
|
||||||
|
|
||||||
|
assert await async_setup_component(hass, DOMAIN, {})
|
||||||
|
await hass.async_block_till_done()
|
||||||
|
assert entry.state == ConfigEntryState.LOADED
|
||||||
|
|
||||||
|
switches = hass.states.async_all(Platform.SWITCH)
|
||||||
|
assert len(switches) == 3
|
||||||
|
assert switches[0].name == f"Mock Title Wi-Fi {expected_wifi_names[0]}"
|
||||||
|
assert switches[1].name == f"Mock Title Wi-Fi {expected_wifi_names[1]}"
|
||||||
|
assert switches[2].name == "printer Internet Access"
|
@ -1,4 +1,4 @@
|
|||||||
"""The tests for the Fritzbox update entity."""
|
"""Tests for Fritz!Tools update platform."""
|
||||||
|
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user