From 387bb763f31316eb7139416356e2ac3a0ce2b324 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 10 Oct 2025 00:47:07 -1000 Subject: [PATCH] merge --- esphome/components/esp32_ble/__init__.py | 4 ++++ tests/components/voice_assistant/common-idf.yaml | 1 + tests/components/xiaomi_miscale copy/test.esp32-ard.yaml | 3 --- tests/components/xiaomi_miscale copy/test.esp32-c3-idf.yaml | 3 --- tests/components/xiaomi_miscale copy/test.esp32-idf.yaml | 3 --- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/esphome/components/esp32_ble/__init__.py b/esphome/components/esp32_ble/__init__.py index 15afb22ab8..b3bd50f6d0 100644 --- a/esphome/components/esp32_ble/__init__.py +++ b/esphome/components/esp32_ble/__init__.py @@ -285,6 +285,10 @@ def consume_connection_slots( def validate_connection_slots(max_connections: int) -> None: """Validate that BLE connection slots don't exceed the configured maximum.""" + # Skip validation in testing mode to allow component grouping + if CORE.testing_mode: + return + ble_data = CORE.data.get(KEY_ESP32_BLE, {}) used_slots = ble_data.get(KEY_USED_CONNECTION_SLOTS, []) num_used = len(used_slots) diff --git a/tests/components/voice_assistant/common-idf.yaml b/tests/components/voice_assistant/common-idf.yaml index b1d249d5b4..ab8cbf2434 100644 --- a/tests/components/voice_assistant/common-idf.yaml +++ b/tests/components/voice_assistant/common-idf.yaml @@ -18,6 +18,7 @@ i2s_audio: micro_wake_word: id: mww_id + microphone: mic_id_external on_wake_word_detected: - voice_assistant.start: wake_word: !lambda return wake_word; diff --git a/tests/components/xiaomi_miscale copy/test.esp32-ard.yaml b/tests/components/xiaomi_miscale copy/test.esp32-ard.yaml index 39af6d18d1..dade44d145 100644 --- a/tests/components/xiaomi_miscale copy/test.esp32-ard.yaml +++ b/tests/components/xiaomi_miscale copy/test.esp32-ard.yaml @@ -1,4 +1 @@ -packages: - ble: !include ../../test_build_components/common/ble/esp32-ard.yaml - <<: !include common.yaml diff --git a/tests/components/xiaomi_miscale copy/test.esp32-c3-idf.yaml b/tests/components/xiaomi_miscale copy/test.esp32-c3-idf.yaml index 9f2634f967..dade44d145 100644 --- a/tests/components/xiaomi_miscale copy/test.esp32-c3-idf.yaml +++ b/tests/components/xiaomi_miscale copy/test.esp32-c3-idf.yaml @@ -1,4 +1 @@ -packages: - ble: !include ../../test_build_components/common/ble/esp32-c3-idf.yaml - <<: !include common.yaml diff --git a/tests/components/xiaomi_miscale copy/test.esp32-idf.yaml b/tests/components/xiaomi_miscale copy/test.esp32-idf.yaml index 7a6541ae76..dade44d145 100644 --- a/tests/components/xiaomi_miscale copy/test.esp32-idf.yaml +++ b/tests/components/xiaomi_miscale copy/test.esp32-idf.yaml @@ -1,4 +1 @@ -packages: - ble: !include ../../test_build_components/common/ble/esp32-idf.yaml - <<: !include common.yaml