mirror of
https://github.com/home-assistant/supervisor.git
synced 2026-04-27 02:42:42 +00:00
9088810b49
* Improve D-Bus error handling for NetworkManager There are quite some errors captured which are related by seemingly a suddenly missing NetworkManager. Errors appear as: 23-11-21 17:42:50 ERROR (MainThread) [supervisor.dbus.network] Error while processing /org/freedesktop/NetworkManager/Devices/10: Remote peer disconnected ... 23-11-21 17:42:50 ERROR (MainThread) [supervisor.dbus.network] Error while processing /org/freedesktop/NetworkManager/Devices/35: The name is not activatable Both errors seem to already happen at introspection time, however the current code doesn't converts these errors to Supervisor issues. This PR uses the already existing `DBus.from_dbus_error()`. Furthermore this adds a new Exception `DBusNoReplyError` for the `ErrorType.NO_REPLY` (or `org.freedesktop.DBus.Error.NoReply` in D-Bus terms, which is the type of the first of the two issues above). And finally it separates the `ErrorType.SERVICE_UNKNOWN` (or `org.freedesktop.DBus.Error.ServiceUnknown` in D-Bus terms, which is the second of the above issue) from `DBusInterfaceError` into a new `DBusServiceUnkownError`. This allows to handle errors more specifically. To avoid too much churn, all instances where `DBusInterfaceError` got handled, we are now also handling `DBusServiceUnkownError`. The `DBusNoReplyError` and `DBusServiceUnkownError` appear when the NetworkManager service stops or crashes. Instead of retrying every interface we know, just give up if one of these issues appear. This should significantly lower error messages users are seeing and Sentry events. * Remove unnecessary statement * Fix pytests * Make sure error strings are compared correctly * Fix typo/remove unnecessary pylint exception * Fix DBusError typing * Add pytest for from_dbus_error * Revert "Make sure error strings are compared correctly" This reverts commit 10dc2e4c3887532921414b4291fe3987186db408. * Add test cases --------- Co-authored-by: Mike Degatano <michael.degatano@gmail.com>
76 lines
2.0 KiB
Python
76 lines
2.0 KiB
Python
"""Test OSAgent dbus interface."""
|
|
# pylint: disable=import-error
|
|
from dbus_fast.aio.message_bus import MessageBus
|
|
import pytest
|
|
|
|
from supervisor.dbus.agent import OSAgent
|
|
|
|
from tests.common import mock_dbus_services
|
|
from tests.dbus_service_mocks.base import DBusServiceMock
|
|
from tests.dbus_service_mocks.os_agent import OSAgent as OSAgentService
|
|
|
|
|
|
@pytest.fixture(name="os_agent_service")
|
|
async def fixture_os_agent_service(
|
|
os_agent_services: dict[str, DBusServiceMock]
|
|
) -> OSAgentService:
|
|
"""Mock OS Agent dbus service."""
|
|
yield os_agent_services["os_agent"]
|
|
|
|
|
|
async def test_dbus_osagent(
|
|
os_agent_service: OSAgentService, dbus_session_bus: MessageBus
|
|
):
|
|
"""Test OS Agent properties."""
|
|
os_agent = OSAgent()
|
|
|
|
assert os_agent.version is None
|
|
assert os_agent.diagnostics is None
|
|
|
|
await os_agent.connect(dbus_session_bus)
|
|
|
|
assert os_agent.version == "1.1.0"
|
|
assert os_agent.diagnostics
|
|
|
|
os_agent_service.emit_properties_changed({"Diagnostics": False})
|
|
await os_agent_service.ping()
|
|
assert os_agent.diagnostics is False
|
|
|
|
os_agent_service.emit_properties_changed({}, ["Diagnostics"])
|
|
await os_agent_service.ping()
|
|
await os_agent_service.ping()
|
|
assert os_agent.diagnostics is True
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"skip_service",
|
|
[
|
|
"os_agent",
|
|
"agent_apparmor",
|
|
"agent_datadisk",
|
|
],
|
|
)
|
|
async def test_dbus_osagent_connect_error(
|
|
skip_service: str, dbus_session_bus: MessageBus, caplog: pytest.LogCaptureFixture
|
|
):
|
|
"""Test OS Agent errors during connect."""
|
|
os_agent_services = {
|
|
"os_agent": None,
|
|
"agent_apparmor": None,
|
|
"agent_cgroup": None,
|
|
"agent_datadisk": None,
|
|
"agent_system": None,
|
|
"agent_boards": None,
|
|
"agent_boards_yellow": None,
|
|
}
|
|
os_agent_services.pop(skip_service)
|
|
await mock_dbus_services(
|
|
os_agent_services,
|
|
dbus_session_bus,
|
|
)
|
|
|
|
os_agent = OSAgent()
|
|
await os_agent.connect(dbus_session_bus)
|
|
|
|
assert "No OS-Agent support on the host" in caplog.text
|