jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-11-09 10:59:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't disconnect in executor (#3901)

Browse Source 
* Don't disconnect in executor

* DBus disconnect doesn't raise

* Separate shutdown and disconnect

* pylint fix

* noop coroutine and test
This commit is contained in:
Mike Degatano
2022-09-27 02:33:28 -04:00
committed by GitHub
parent fb46335d16
commit d15a7c27ca
11 changed files with 99 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/dbus/test_interface.py
View File

@@ -7,16 +7,16 @@ from unittest.mock import MagicMock
from dbus_fast.aio.message_bus import MessageBus
import pytest
from supervisor.dbus.interface import DBusInterface, DBusInterfaceProxy
from supervisor.dbus.interface import DBusInterfaceProxy
from tests.common import fire_property_change_signal, fire_watched_signal
@dataclass
class DBusInterfaceMock:
class DBusInterfaceProxyMock:
"""DBus Interface and signalling mocks."""
obj: DBusInterface
obj: DBusInterfaceProxy
on_device_added: MagicMock = MagicMock()
off_device_added: MagicMock = MagicMock()
@@ -24,7 +24,7 @@ class DBusInterfaceMock:
@pytest.fixture(name="proxy")
async def fixture_proxy(
request: pytest.FixtureRequest, dbus_bus: MessageBus, dbus
) -> DBusInterfaceMock:
) -> DBusInterfaceProxyMock:
"""Get a proxy."""
proxy = DBusInterfaceProxy()
proxy.bus_name = "org.freedesktop.NetworkManager"
@@ -37,7 +37,7 @@ async def fixture_proxy(
# pylint: disable=protected-access
nm_proxy = proxy.dbus._proxies["org.freedesktop.NetworkManager"]
mock = DBusInterfaceMock(proxy)
mock = DBusInterfaceProxyMock(proxy)
setattr(nm_proxy, "on_device_added", mock.on_device_added)
setattr(nm_proxy, "off_device_added", mock.off_device_added)
@@ -45,7 +45,7 @@ async def fixture_proxy(
@pytest.mark.parametrize("proxy", [True], indirect=True)
async def test_dbus_proxy_connect(dbus_bus: MessageBus, proxy: DBusInterfaceMock):
async def test_dbus_proxy_connect(proxy: DBusInterfaceProxyMock):
"""Test dbus proxy connect."""
assert proxy.obj.is_connected
assert proxy.obj.properties["Connectivity"] == 4
@@ -56,9 +56,7 @@ async def test_dbus_proxy_connect(dbus_bus: MessageBus, proxy: DBusInterfaceMock
@pytest.mark.parametrize("proxy", [False], indirect=True)
async def test_dbus_proxy_connect_no_sync(
dbus_bus: MessageBus, proxy: DBusInterfaceMock
):
async def test_dbus_proxy_connect_no_sync(proxy: DBusInterfaceProxyMock):
"""Test dbus proxy connect with no properties sync."""
assert proxy.obj.is_connected
assert proxy.obj.properties["Connectivity"] == 4
@@ -68,9 +66,7 @@ async def test_dbus_proxy_connect_no_sync(
@pytest.mark.parametrize("proxy", [False], indirect=True)
async def test_signal_listener_disconnect(
dbus_bus: MessageBus, proxy: DBusInterfaceMock
):
async def test_signal_listener_disconnect(proxy: DBusInterfaceProxyMock):
"""Test disconnect/delete unattaches signal listeners."""
assert proxy.obj.is_connected
device = None
@@ -90,3 +86,23 @@ async def test_signal_listener_disconnect(
proxy.obj.disconnect()
proxy.off_device_added.assert_called_once_with(callback, unpack_variants=True)
@pytest.mark.parametrize("proxy", [False], indirect=True)
async def test_dbus_proxy_shutdown_pending_task(proxy: DBusInterfaceProxyMock):
"""Test pending task does not raise DBusNotConnectedError after shutdown."""
assert proxy.obj.is_connected
device = None
async def callback(dev: str):
nonlocal device
await proxy.obj.update()
device = dev
proxy.obj.dbus.on_device_added(callback)
fire_watched_signal(
proxy.obj, "org.freedesktop.NetworkManager.DeviceAdded", ["/test/obj/1"]
)
proxy.obj.shutdown()
await asyncio.sleep(0)
assert device == "/test/obj/1"