jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-25 06:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Gracefully handle udev not available via OSError when setting up usb (#54967)

Browse Source
This commit is contained in:
J. Nick Koston 2021-08-21 07:24:45 -05:00 committed by GitHub
parent c609236a63
commit 51434c5faa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/usb/__init__.py
View File

@ -113,7 +113,7 @@ class USBDiscovery:
try: try:
context = Context() context = Context()
except ImportError: except (ImportError, OSError):
return False return False
monitor = Monitor.from_netlink(context) monitor = Monitor.from_netlink(context)

5
tests/components/usb/test_init.py
View File

@ -243,7 +243,8 @@ async def test_discovered_by_scanner_after_started_no_vid_pid(hass):
assert len(mock_config_flow.mock_calls) == 0 assert len(mock_config_flow.mock_calls) == 0
async def test_non_matching_discovered_by_scanner_after_started(hass): @pytest.mark.parametrize("exception_type", [ImportError, OSError])
async def test_non_matching_discovered_by_scanner_after_started(hass, exception_type):
"""Test a device is discovered by the scanner after the started event that does not match.""" """Test a device is discovered by the scanner after the started event that does not match."""
new_usb = [{"domain": "test1", "vid": "4444", "pid": "4444"}] new_usb = [{"domain": "test1", "vid": "4444", "pid": "4444"}]
@ -258,7 +259,7 @@ async def test_non_matching_discovered_by_scanner_after_started(hass):
) )
] ]
with patch("pyudev.Context", side_effect=ImportError), patch( with patch("pyudev.Context", side_effect=exception_type), patch(
"homeassistant.components.usb.async_get_usb", return_value=new_usb "homeassistant.components.usb.async_get_usb", return_value=new_usb
), patch( ), patch(
"homeassistant.components.usb.comports", return_value=mock_comports "homeassistant.components.usb.comports", return_value=mock_comports