From 8319f232b85f72ef0330f42d180cdb946ab6d3a5 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Fri, 3 Sep 2021 08:05:37 +0200
Subject: [PATCH] Disable observer for USB on containers (#55570)

* Disable observer for USB on containers

* remove operating system test

Co-authored-by: J. Nick Koston <nick@koston.org>
---
 homeassistant/components/usb/__init__.py |  2 +-
 tests/components/usb/test_init.py        | 49 ------------------------
 2 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/homeassistant/components/usb/__init__.py b/homeassistant/components/usb/__init__.py
index 679f2e1caa2..13f18216cca 100644
--- a/homeassistant/components/usb/__init__.py
+++ b/homeassistant/components/usb/__init__.py
@@ -112,7 +112,7 @@ class USBDiscovery:
         if not sys.platform.startswith("linux"):
             return
         info = await system_info.async_get_system_info(self.hass)
-        if info.get("docker") and not info.get("hassio"):
+        if info.get("docker"):
             return
 
         from pyudev import (  # pylint: disable=import-outside-toplevel
diff --git a/tests/components/usb/test_init.py b/tests/components/usb/test_init.py
index 6ba21222052..b09dad9ebe4 100644
--- a/tests/components/usb/test_init.py
+++ b/tests/components/usb/test_init.py
@@ -52,55 +52,6 @@ def mock_venv():
         yield
 
 
-@pytest.mark.skipif(
-    not sys.platform.startswith("linux"),
-    reason="Only works on linux",
-)
-async def test_discovered_by_observer_before_started(hass, operating_system):
-    """Test a device is discovered by the observer before started."""
-
-    async def _mock_monitor_observer_callback(callback):
-        await hass.async_add_executor_job(
-            callback, MagicMock(action="add", device_path="/dev/new")
-        )
-
-    def _create_mock_monitor_observer(monitor, callback, name):
-        hass.async_create_task(_mock_monitor_observer_callback(callback))
-        return MagicMock()
-
-    new_usb = [{"domain": "test1", "vid": "3039", "pid": "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(
-        "homeassistant.components.usb.async_get_usb", return_value=new_usb
-    ), patch(
-        "homeassistant.components.usb.comports", return_value=mock_comports
-    ), patch(
-        "pyudev.MonitorObserver", new=_create_mock_monitor_observer
-    ):
-        assert await async_setup_component(hass, "usb", {"usb": {}})
-        await hass.async_block_till_done()
-
-    with patch("homeassistant.components.usb.comports", return_value=[]), patch.object(
-        hass.config_entries.flow, "async_init"
-    ) as mock_config_flow:
-        hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
-        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(
     not sys.platform.startswith("linux"),
     reason="Only works on linux",