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

No unpack variants for property sets (#3911)

Browse Source
This commit is contained in:
Mike Degatano 2022-09-29 12:13:02 -04:00 committed by GitHub
parent 2be33a80a7
commit c0a409b25f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
supervisor/utils/dbus.py
View File

@ -90,9 +90,11 @@ class DBus:
proxy_interface.path, proxy_interface.path,
) )
try: try:
return await getattr(proxy_interface, method)( if unpack_variants:
*args, unpack_variants=unpack_variants return await getattr(proxy_interface, method)(
) *args, unpack_variants=True
)
return await getattr(proxy_interface, method)(*args)
except DBusError as err: except DBusError as err:
raise DBus.from_dbus_error(err) raise DBus.from_dbus_error(err)
@ -299,7 +301,7 @@ class DBusCallWrapper:
return _off_signal return _off_signal
if dbus_type in ["call", "get", "set"]: if dbus_type in ["call", "get"]:
def _method_wrapper(*args, unpack_variants: bool = True) -> Awaitable: def _method_wrapper(*args, unpack_variants: bool = True) -> Awaitable:
return DBus.call_dbus( return DBus.call_dbus(
@ -308,6 +310,13 @@ class DBusCallWrapper:
return _method_wrapper return _method_wrapper
elif dbus_type == "set":
def _set_wrapper(*args) -> Awaitable:
return DBus.call_dbus(self._proxy, name, *args, unpack_variants=False)
return _set_wrapper
# Didn't reach the dbus call yet, just happened to hit another interface. Return a wrapper # Didn't reach the dbus call yet, just happened to hit another interface. Return a wrapper
return DBusCallWrapper(self.dbus, f"{self.interface}.{name}") return DBusCallWrapper(self.dbus, f"{self.interface}.{name}")

15
tests/api/test_supervisor.py
View File

@ -1,5 +1,6 @@
"""Test Supervisor API.""" """Test Supervisor API."""
# pylint: disable=protected-access # pylint: disable=protected-access
import asyncio
from unittest.mock import patch from unittest.mock import patch
from aiohttp.test_utils import TestClient from aiohttp.test_utils import TestClient
@ -114,3 +115,17 @@ async def test_api_supervisor_options_auto_update(
assert response.status == 200 assert response.status == 200
assert coresys.updater.auto_update is False assert coresys.updater.auto_update is False
async def test_api_supervisor_options_diagnostics(
api_client: TestClient, coresys: CoreSys, dbus: list[str]
):
"""Test changing diagnostics."""
await coresys.dbus.agent.connect(coresys.dbus.bus)
dbus.clear()
response = await api_client.post("/supervisor/options", json={"diagnostics": True})
await asyncio.sleep(0)
assert response.status == 200
assert dbus == ["/io/hass/os-io.hass.os.Diagnostics"]