Home-Assistant/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2026-04-17 23:33:35 +01:00
Code Activity

Migrate info, events and container logs to aiodocker (#6514)

Browse Source 
* Migrate info and events to aiodocker

* Migrate container logs to aiodocker

* Fix dns plugin loop test

* Fix mocking for docker info

* Fixes from feedback

* Harden monitor error handling

* Deleted failing tests because they were not useful
This commit is contained in:
Mike Degatano
2026-02-03 12:36:41 -05:00
committed by GitHub
parent c2de83e80d
commit a122b5f1e9
16 changed files with 349 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
tests/docker/test_monitor.py
View File

@@ -2,12 +2,13 @@
import asyncio
from typing import Any
from unittest.mock import PropertyMock, patch
from unittest.mock import patch
from aiodocker.containers import DockerContainer
from awesomeversion import AwesomeVersion
import pytest
from supervisor.bus import Bus
from supervisor.const import BusEvent
from supervisor.coresys import CoreSys
from supervisor.docker.const import ContainerState
@@ -90,15 +91,13 @@ async def test_events(
event["Actor"]["Attributes"]["name"] = "some_container"
event["Actor"]["ID"] = "abc123"
event["time"] = 123
with (
patch(
"supervisor.docker.manager.DockerAPI.events",
new=PropertyMock(return_value=[event]),
),
patch.object(type(coresys.bus), "fire_event") as fire_event,
):
await coresys.docker.monitor.load()
await asyncio.sleep(0.1)
with patch.object(
Bus, "fire_event", return_value=[coresys.create_task(asyncio.sleep(0))]
) as fire_event:
await coresys.docker.docker.events.channel.publish(event)
await asyncio.sleep(0)
await coresys.docker.monitor.unload()
if expected:
fire_event.assert_called_once_with(
BusEvent.DOCKER_CONTAINER_STATE_CHANGE,
@@ -119,27 +118,21 @@ async def test_unlabeled_container(coresys: CoreSys, container: DockerContainer)
}
await coresys.homeassistant.core.instance.attach(AwesomeVersion("2022.7.3"))
with (
patch(
"supervisor.docker.manager.DockerAPI.events",
new=PropertyMock(
return_value=[
{
"time": 123,
"Type": "container",
"Action": "die",
"Actor": {
"ID": "abc123",
"Attributes": {"name": "homeassistant", "exitCode": "137"},
},
}
]
),
),
patch.object(type(coresys.bus), "fire_event") as fire_event,
):
await coresys.docker.monitor.load()
await asyncio.sleep(0.1)
with patch.object(
Bus, "fire_event", return_value=[coresys.create_task(asyncio.sleep(0))]
) as fire_event:
await coresys.docker.docker.events.channel.publish(
{
"time": 123,
"Type": "container",
"Action": "die",
"Actor": {
"ID": "abc123",
"Attributes": {"name": "homeassistant", "exitCode": "137"},
},
}
)
await coresys.docker.monitor.unload()
fire_event.assert_called_once_with(
BusEvent.DOCKER_CONTAINER_STATE_CHANGE,
DockerContainerStateEvent(