mirror of
https://github.com/home-assistant/core.git
synced 2025-07-22 20:57:21 +00:00
Gracefully handle pyudev failing to filter on WSL (#55286)
* Gracefully handle pyudev failing to filter on WSL * add debug message * add mocks so we reach the new check
This commit is contained in:
parent
14aa19b814
commit
dfc2556669
@ -127,7 +127,13 @@ class USBDiscovery:
|
|||||||
return
|
return
|
||||||
|
|
||||||
monitor = Monitor.from_netlink(context)
|
monitor = Monitor.from_netlink(context)
|
||||||
monitor.filter_by(subsystem="tty")
|
try:
|
||||||
|
monitor.filter_by(subsystem="tty")
|
||||||
|
except ValueError as ex: # this fails on WSL
|
||||||
|
_LOGGER.debug(
|
||||||
|
"Unable to setup pyudev filtering; This is expected on WSL: %s", ex
|
||||||
|
)
|
||||||
|
return
|
||||||
observer = MonitorObserver(
|
observer = MonitorObserver(
|
||||||
monitor, callback=self._device_discovered, name="usb-observer"
|
monitor, callback=self._device_discovered, name="usb-observer"
|
||||||
)
|
)
|
||||||
|
@ -38,6 +38,20 @@ def mock_docker():
|
|||||||
yield
|
yield
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture(name="venv")
|
||||||
|
def mock_venv():
|
||||||
|
"""Mock running Home Assistant in a venv container."""
|
||||||
|
with patch(
|
||||||
|
"homeassistant.components.usb.system_info.async_get_system_info",
|
||||||
|
return_value={
|
||||||
|
"hassio": False,
|
||||||
|
"docker": False,
|
||||||
|
"virtualenv": True,
|
||||||
|
},
|
||||||
|
):
|
||||||
|
yield
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.skipif(
|
@pytest.mark.skipif(
|
||||||
not sys.platform.startswith("linux"),
|
not sys.platform.startswith("linux"),
|
||||||
reason="Only works on linux",
|
reason="Only works on linux",
|
||||||
@ -606,6 +620,48 @@ async def test_non_matching_discovered_by_scanner_after_started(
|
|||||||
assert len(mock_config_flow.mock_calls) == 0
|
assert len(mock_config_flow.mock_calls) == 0
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.skipif(
|
||||||
|
not sys.platform.startswith("linux"),
|
||||||
|
reason="Only works on linux",
|
||||||
|
)
|
||||||
|
async def test_observer_on_wsl_fallback_without_throwing_exception(
|
||||||
|
hass, hass_ws_client, venv
|
||||||
|
):
|
||||||
|
"""Test that observer on WSL failure results in fallback to scanning without raising an exception."""
|
||||||
|
new_usb = [{"domain": "test1", "vid": "3039"}]
|
||||||
|
|
||||||
|
mock_comports = [
|
||||||
|
MagicMock(
|
||||||
|
device=slae_sh_device.device,
|
||||||
|
vid=12345,
|
||||||
|
pid=12345,
|
||||||
|
serial_number=slae_sh_device.serial_number,
|
||||||
|
manufacturer=slae_sh_device.manufacturer,
|
||||||
|
description=slae_sh_device.description,
|
||||||
|
)
|
||||||
|
]
|
||||||
|
|
||||||
|
with patch("pyudev.Context"), patch(
|
||||||
|
"pyudev.Monitor.filter_by", side_effect=ValueError
|
||||||
|
), patch("homeassistant.components.usb.async_get_usb", return_value=new_usb), patch(
|
||||||
|
"homeassistant.components.usb.comports", return_value=mock_comports
|
||||||
|
), patch.object(
|
||||||
|
hass.config_entries.flow, "async_init"
|
||||||
|
) as mock_config_flow:
|
||||||
|
assert await async_setup_component(hass, "usb", {"usb": {}})
|
||||||
|
await hass.async_block_till_done()
|
||||||
|
hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
|
||||||
|
await hass.async_block_till_done()
|
||||||
|
ws_client = await hass_ws_client(hass)
|
||||||
|
await ws_client.send_json({"id": 1, "type": "usb/scan"})
|
||||||
|
response = await ws_client.receive_json()
|
||||||
|
assert response["success"]
|
||||||
|
await hass.async_block_till_done()
|
||||||
|
|
||||||
|
assert len(mock_config_flow.mock_calls) == 1
|
||||||
|
assert mock_config_flow.mock_calls[0][1][0] == "test1"
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.skipif(
|
@pytest.mark.skipif(
|
||||||
not sys.platform.startswith("linux"),
|
not sys.platform.startswith("linux"),
|
||||||
reason="Only works on linux",
|
reason="Only works on linux",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user