jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-18 22:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce patching call dbus in tests (#3866)

Browse Source
This commit is contained in:
Mike Degatano 2022-09-13 15:22:15 -04:00 committed by GitHub
parent d195f19fa8
commit 5f98ab7e3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tests/api/test_network.py
View File

@ -1,5 +1,5 @@
"""Test NetwrokInterface API."""
from unittest.mock import AsyncMock, Mock, patch
from unittest.mock import AsyncMock, patch
import pytest
@ -99,27 +99,28 @@ async def test_api_network_interface_info_default(api_client):
@pytest.mark.asyncio
async def test_api_network_interface_update(api_client, coresys: CoreSys):
async def test_api_network_interface_update(
api_client, coresys: CoreSys, dbus: list[str]
):
"""Test network manager api."""
with patch.object(
type(coresys.host.sys_dbus.network),
"check_connectivity",
new=Mock(wraps=coresys.host.sys_dbus.network.check_connectivity),
) as check_connectivity:
resp = await api_client.post(
f"/network/interface/{TEST_INTERFACE}/update",
json={
"ipv4": {
"method": "static",
"nameservers": ["1.1.1.1"],
"address": ["192.168.2.148/24"],
"gateway": "192.168.1.1",
}
},
)
result = await resp.json()
assert result["result"] == "ok"
check_connectivity.assert_called_once_with(force=True)
dbus.clear()
resp = await api_client.post(
f"/network/interface/{TEST_INTERFACE}/update",
json={
"ipv4": {
"method": "static",
"nameservers": ["1.1.1.1"],
"address": ["192.168.2.148/24"],
"gateway": "192.168.1.1",
}
},
)
result = await resp.json()
assert result["result"] == "ok"
assert (
"/org/freedesktop/NetworkManager-org.freedesktop.NetworkManager.CheckConnectivity"
in dbus
)
@pytest.mark.asyncio

82
tests/host/test_network.py
View File

@ -13,48 +13,42 @@ from supervisor.host.network import Interface, IpConfig
from supervisor.utils.dbus import DBus
async def test_load(coresys: CoreSys):
async def test_load(coresys: CoreSys, dbus: list[str]):
"""Test network manager load."""
with patch.object(
type(coresys.host.sys_dbus.network),
"activate_connection",
new=Mock(wraps=coresys.host.sys_dbus.network.activate_connection),
) as activate_connection, patch.object(
type(coresys.host.sys_dbus.network),
"check_connectivity",
new=Mock(wraps=coresys.host.sys_dbus.network.check_connectivity),
) as check_connectivity:
await coresys.host.network.load()
dbus.clear()
await coresys.host.network.load()
assert coresys.host.network.connectivity is True
assert coresys.host.network.connectivity is True
assert len(coresys.host.network.dns_servers) == 1
assert str(coresys.host.network.dns_servers[0]) == "192.168.30.1"
assert len(coresys.host.network.dns_servers) == 1
assert str(coresys.host.network.dns_servers[0]) == "192.168.30.1"
assert len(coresys.host.network.interfaces) == 2
assert coresys.host.network.interfaces[0].name == "eth0"
assert coresys.host.network.interfaces[0].enabled is True
assert coresys.host.network.interfaces[0].ipv4.method == InterfaceMethod.AUTO
assert coresys.host.network.interfaces[0].ipv4.gateway == IPv4Address(
"192.168.2.1"
)
assert coresys.host.network.interfaces[0].ipv4.ready is True
assert coresys.host.network.interfaces[0].ipv6.method == InterfaceMethod.AUTO
assert coresys.host.network.interfaces[0].ipv6.gateway == IPv6Address(
"fe80::da58:d7ff:fe00:9c69"
)
assert coresys.host.network.interfaces[0].ipv6.ready is True
assert coresys.host.network.interfaces[1].name == "wlan0"
assert coresys.host.network.interfaces[1].enabled is False
assert len(coresys.host.network.interfaces) == 2
assert coresys.host.network.interfaces[0].name == "eth0"
assert coresys.host.network.interfaces[0].enabled is True
assert coresys.host.network.interfaces[0].ipv4.method == InterfaceMethod.AUTO
assert coresys.host.network.interfaces[0].ipv4.gateway == IPv4Address("192.168.2.1")
assert coresys.host.network.interfaces[0].ipv4.ready is True
assert coresys.host.network.interfaces[0].ipv6.method == InterfaceMethod.AUTO
assert coresys.host.network.interfaces[0].ipv6.gateway == IPv6Address(
"fe80::da58:d7ff:fe00:9c69"
)
assert coresys.host.network.interfaces[0].ipv6.ready is True
assert coresys.host.network.interfaces[1].name == "wlan0"
assert coresys.host.network.interfaces[1].enabled is False
activate_connection.assert_called_once_with(
"/org/freedesktop/NetworkManager/Settings/1",
"/org/freedesktop/NetworkManager/Devices/1",
)
assert check_connectivity.call_count == 2
assert check_connectivity.call_args_list[0][1] == {"force": False}
assert check_connectivity.call_args_list[1][1] == {"force": False}
assert (
"/org/freedesktop/NetworkManager-org.freedesktop.NetworkManager.ActivateConnection"
in dbus
)
assert (
"/org/freedesktop/NetworkManager-org.freedesktop.NetworkManager.Connectivity"
in dbus
)
assert (
"/org/freedesktop/NetworkManager-org.freedesktop.NetworkManager.CheckConnectivity"
not in dbus
)
async def test_load_with_disabled_methods(coresys: CoreSys):
@ -82,7 +76,7 @@ async def test_load_with_disabled_methods(coresys: CoreSys):
activate_connection.assert_not_called()
async def test_load_with_network_connection_issues(coresys: CoreSys):
async def test_load_with_network_connection_issues(coresys: CoreSys, dbus: list[str]):
"""Test load does not update interfaces with network connection issues."""
with patch(
"supervisor.dbus.network.connection.NetworkConnection.state_flags",
@ -90,14 +84,14 @@ async def test_load_with_network_connection_issues(coresys: CoreSys):
), patch(
"supervisor.dbus.network.connection.NetworkConnection.ipv4",
new=PropertyMock(return_value=None),
), patch.object(
coresys.host.sys_dbus.network,
"activate_connection",
new=Mock(wraps=coresys.host.sys_dbus.network.activate_connection),
) as activate_connection:
):
dbus.clear()
await coresys.host.network.load()
activate_connection.assert_not_called()
assert (
"/org/freedesktop/NetworkManager-org.freedesktop.NetworkManager.ActivateConnection"
not in dbus
)
assert len(coresys.host.network.interfaces) == 2
assert coresys.host.network.interfaces[0].name == "eth0"