From 6b95fa59429999966b4ff30acf42a1546f448a1b Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Mon, 2 Jan 2023 16:10:39 -1000 Subject: [PATCH] Fix bluetooth not being loaded with esphome proxies when removed from default_config (#85032) * Fix bluetooth not being loaded with esphome proxies when removed from default_config fixes #84960 * actually commit the conftest change --- homeassistant/components/esphome/manifest.json | 3 ++- tests/components/esphome/conftest.py | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/esphome/manifest.json b/homeassistant/components/esphome/manifest.json index 83ebc60edd6..ce3dc116715 100644 --- a/homeassistant/components/esphome/manifest.json +++ b/homeassistant/components/esphome/manifest.json @@ -7,7 +7,8 @@ "zeroconf": ["_esphomelib._tcp.local."], "dhcp": [{ "registered_devices": true }], "codeowners": ["@OttoWinter", "@jesserockz"], - "after_dependencies": ["bluetooth", "zeroconf", "tag"], + "dependencies": ["bluetooth"], + "after_dependencies": ["zeroconf", "tag"], "iot_class": "local_push", "integration_type": "device", "loggers": ["aioesphomeapi", "noiseprotocol"] diff --git a/tests/components/esphome/conftest.py b/tests/components/esphome/conftest.py index cc4c8af9d73..3382e978a19 100644 --- a/tests/components/esphome/conftest.py +++ b/tests/components/esphome/conftest.py @@ -14,6 +14,11 @@ from homeassistant.core import HomeAssistant from tests.common import MockConfigEntry +@pytest.fixture(autouse=True) +def mock_bluetooth(enable_bluetooth): + """Auto mock bluetooth.""" + + @pytest.fixture(autouse=True) def esphome_mock_async_zeroconf(mock_async_zeroconf): """Auto mock zeroconf."""