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

Fix asyncio.wait in supervisor.reload (#4333)

Browse Source 
* Fix asyncio.wait in supervisor.reload

* Unwrap to prevent throttling across tests
This commit is contained in:
Mike Degatano 2023-06-01 18:38:42 -04:00 committed by GitHub
parent 0200c72db1
commit c896b60410
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
supervisor/api/supervisor.py
View File

@ -208,10 +208,13 @@ class APISupervisor(CoreSysAttributes):
return asyncio.shield( return asyncio.shield(
asyncio.wait( asyncio.wait(
[ [
self.sys_create_task(coro)
for coro in [
self.sys_updater.reload(), self.sys_updater.reload(),
self.sys_homeassistant.secrets.reload(), self.sys_homeassistant.secrets.reload(),
self.sys_resolution.evaluate.evaluate_system(), self.sys_resolution.evaluate.evaluate_system(),
] ]
]
) )
) )

6
tests/api/test_supervisor.py
View File

@ -160,3 +160,9 @@ async def test_api_supervisor_logs(api_client: TestClient, docker_logs: MagicMoc
"\x1b[36m22-10-11 14:04:23 DEBUG (MainThread) [supervisor.utils.dbus] D-Bus call - org.freedesktop.DBus.Properties.call_get_all on /io/hass/os\x1b[0m", "\x1b[36m22-10-11 14:04:23 DEBUG (MainThread) [supervisor.utils.dbus] D-Bus call - org.freedesktop.DBus.Properties.call_get_all on /io/hass/os\x1b[0m",
"\x1b[36m22-10-11 14:04:23 DEBUG (MainThread) [supervisor.utils.dbus] D-Bus call - org.freedesktop.DBus.Properties.call_get_all on /io/hass/os/AppArmor\x1b[0m", "\x1b[36m22-10-11 14:04:23 DEBUG (MainThread) [supervisor.utils.dbus] D-Bus call - org.freedesktop.DBus.Properties.call_get_all on /io/hass/os/AppArmor\x1b[0m",
] ]
async def test_api_supervisor_reload(api_client: TestClient):
"""Test supervisor reload."""
resp = await api_client.post("/supervisor/reload")
assert resp.status == 200

8
tests/homeassistant/test_module.py
View File

@ -5,6 +5,7 @@ from unittest.mock import patch
from supervisor.coresys import CoreSys from supervisor.coresys import CoreSys
from supervisor.docker.interface import DockerInterface from supervisor.docker.interface import DockerInterface
from supervisor.homeassistant.secrets import HomeAssistantSecrets
async def test_load(coresys: CoreSys, tmp_supervisor_data: Path): async def test_load(coresys: CoreSys, tmp_supervisor_data: Path):
@ -12,7 +13,12 @@ async def test_load(coresys: CoreSys, tmp_supervisor_data: Path):
with open(tmp_supervisor_data / "homeassistant" / "secrets.yaml", "w") as secrets: with open(tmp_supervisor_data / "homeassistant" / "secrets.yaml", "w") as secrets:
secrets.write("hello: world\n") secrets.write("hello: world\n")
with patch.object(DockerInterface, "attach") as attach: # Unwrap read_secrets to prevent throttling between tests
with patch.object(DockerInterface, "attach") as attach, patch.object(
HomeAssistantSecrets,
"_read_secrets",
new=HomeAssistantSecrets._read_secrets.__wrapped__,
):
await coresys.homeassistant.load() await coresys.homeassistant.load()
attach.assert_called_once() attach.assert_called_once()