Merge remote-tracking branch 'upstream/dev' into 20260218-zigbee-proxy

tests/component_tests/deep_sleep/test_deep_sleep.py

@@ -8,7 +8,7 @@ def test_deep_sleep_setup(generate_main):
     main_cpp = generate_main("tests/component_tests/deep_sleep/test_deep_sleep1.yaml")
 
     assert "deepsleep = new deep_sleep::DeepSleepComponent();" in main_cpp
-    assert "App.register_component(deepsleep);" in main_cpp
+    assert "App.register_component_(deepsleep);" in main_cpp
 
 
 def test_deep_sleep_sleep_duration(generate_main):

tests/component_tests/esp32/config/execute_from_psram_disabled.yaml

@@ -0,0 +1,10 @@
+esphome:
+  name: test
+
+esp32:
+  variant: esp32s3
+  framework:
+    type: esp-idf
+
+psram:
+  mode: octal

tests/component_tests/esp32/config/execute_from_psram_p4.yaml

@@ -0,0 +1,11 @@
+esphome:
+  name: test
+
+esp32:
+  variant: esp32p4
+  framework:
+    type: esp-idf
+    advanced:
+      execute_from_psram: true
+
+psram:

tests/component_tests/esp32/config/execute_from_psram_s3.yaml

@@ -0,0 +1,12 @@
+esphome:
+  name: test
+
+esp32:
+  variant: esp32s3
+  framework:
+    type: esp-idf
+    advanced:
+      execute_from_psram: true
+
+psram:
+  mode: octal

tests/component_tests/esp32/test_esp32.py

@@ -2,13 +2,17 @@
 Test ESP32 configuration
 """
 
+from collections.abc import Callable
+from pathlib import Path
 from typing import Any
 
 import pytest
 
 from esphome.components.esp32 import VARIANTS
+from esphome.components.esp32.const import KEY_ESP32, KEY_SDKCONFIG_OPTIONS
 import esphome.config_validation as cv
 from esphome.const import CONF_ESPHOME, PlatformFramework
+from esphome.core import CORE
 from tests.component_tests.types import SetCoreConfigCallable
 
 
@@ -70,7 +74,7 @@ def test_esp32_config(
                     "advanced": {"execute_from_psram": True},
                 },
             },
-            r"'execute_from_psram' is only supported on ESP32S3 variant @ data\['framework'\]\['advanced'\]\['execute_from_psram'\]",
+            r"'execute_from_psram' is not available on this esp32 variant @ data\['framework'\]\['advanced'\]\['execute_from_psram'\]",
             id="execute_from_psram_invalid_for_variant_config",
         ),
         pytest.param(
@@ -82,7 +86,18 @@ def test_esp32_config(
                 },
             },
             r"'execute_from_psram' requires PSRAM to be configured @ data\['framework'\]\['advanced'\]\['execute_from_psram'\]",
-            id="execute_from_psram_requires_psram_config",
+            id="execute_from_psram_requires_psram_s3_config",
+        ),
+        pytest.param(
+            {
+                "variant": "esp32p4",
+                "framework": {
+                    "type": "esp-idf",
+                    "advanced": {"execute_from_psram": True},
+                },
+            },
+            r"'execute_from_psram' requires PSRAM to be configured @ data\['framework'\]\['advanced'\]\['execute_from_psram'\]",
+            id="execute_from_psram_requires_psram_p4_config",
         ),
         pytest.param(
             {
@@ -108,3 +123,39 @@ def test_esp32_configuration_errors(
 
     with pytest.raises(cv.Invalid, match=error_match):
         FINAL_VALIDATE_SCHEMA(CONFIG_SCHEMA(config))
+
+
+def test_execute_from_psram_s3_sdkconfig(
+    generate_main: Callable[[str | Path], str],
+    component_config_path: Callable[[str], Path],
+) -> None:
+    """Test that execute_from_psram on ESP32-S3 sets the correct sdkconfig options."""
+    generate_main(component_config_path("execute_from_psram_s3.yaml"))
+    sdkconfig = CORE.data[KEY_ESP32][KEY_SDKCONFIG_OPTIONS]
+    assert sdkconfig.get("CONFIG_SPIRAM_FETCH_INSTRUCTIONS") is True
+    assert sdkconfig.get("CONFIG_SPIRAM_RODATA") is True
+    assert "CONFIG_SPIRAM_XIP_FROM_PSRAM" not in sdkconfig
+
+
+def test_execute_from_psram_p4_sdkconfig(
+    generate_main: Callable[[str | Path], str],
+    component_config_path: Callable[[str], Path],
+) -> None:
+    """Test that execute_from_psram on ESP32-P4 sets the correct sdkconfig options."""
+    generate_main(component_config_path("execute_from_psram_p4.yaml"))
+    sdkconfig = CORE.data[KEY_ESP32][KEY_SDKCONFIG_OPTIONS]
+    assert sdkconfig.get("CONFIG_SPIRAM_XIP_FROM_PSRAM") is True
+    assert "CONFIG_SPIRAM_FETCH_INSTRUCTIONS" not in sdkconfig
+    assert "CONFIG_SPIRAM_RODATA" not in sdkconfig
+
+
+def test_execute_from_psram_disabled_sdkconfig(
+    generate_main: Callable[[str | Path], str],
+    component_config_path: Callable[[str], Path],
+) -> None:
+    """Test that without execute_from_psram, no XIP sdkconfig options are set."""
+    generate_main(component_config_path("execute_from_psram_disabled.yaml"))
+    sdkconfig = CORE.data[KEY_ESP32][KEY_SDKCONFIG_OPTIONS]
+    assert "CONFIG_SPIRAM_FETCH_INSTRUCTIONS" not in sdkconfig
+    assert "CONFIG_SPIRAM_RODATA" not in sdkconfig
+    assert "CONFIG_SPIRAM_XIP_FROM_PSRAM" not in sdkconfig

tests/component_tests/ota/test_web_server_ota.py

@@ -27,7 +27,7 @@ def test_web_server_ota_generated(generate_main: Callable[[str], str]) -> None:
     assert "global_web_server_base" in main_cpp
 
     # Check component is registered
-    assert "App.register_component(web_server_webserverotacomponent_id)" in main_cpp
+    assert "App.register_component_(web_server_webserverotacomponent_id)" in main_cpp
 
 
 def test_web_server_ota_with_callbacks(generate_main: Callable[[str], str]) -> None:

tests/components/esp32/test.esp32-idf.yaml

@@ -10,6 +10,7 @@ esp32:
       use_full_certificate_bundle: false  # Test CMN bundle (default)
       include_builtin_idf_components:
         - freertos  # Test escape hatch (freertos is always included anyway)
+      enable_full_printf: false
       disable_debug_stubs: true
       disable_ocd_aware: true
       disable_usb_serial_jtag_secondary: true

tests/components/esp32_ble/test-extended-auth-req-params-single.esp32-idf.yaml

@@ -0,0 +1,6 @@
+esp32_ble:
+  io_capability: keyboard_display
+  # Explicitly not setting some parameters to test ifdef selection
+  # max_key_size: 16
+  # min_key_size: 7
+  auth_req_mode: sc_mitm_bond

tests/components/esp32_ble/test-extended-auth-req-params.esp32-idf.yaml

@@ -0,0 +1,5 @@
+esp32_ble:
+  io_capability: keyboard_display
+  max_key_size: 16
+  min_key_size: 7
+  auth_req_mode: sc_mitm_bond

tests/components/esp32_hosted/test-sdio-speed.esp32-p4-idf.yaml

@@ -0,0 +1,16 @@
+esp32_hosted:
+  variant: ESP32C6
+  slot: 1
+  active_high: true
+  reset_pin: GPIO15
+  cmd_pin: GPIO13
+  clk_pin: GPIO12
+  d0_pin: GPIO11
+  d1_pin: GPIO10
+  d2_pin: GPIO9
+  d3_pin: GPIO8
+  sdio_frequency: 8MHz
+
+wifi:
+  ssid: MySSID
+  password: password1

tests/components/esp32_touch/common-variants.yaml

@@ -4,7 +4,6 @@ esp32_touch:
   measurement_duration: 8ms
   low_voltage_reference: 0.5V
   high_voltage_reference: 2.7V
-  voltage_attenuation: 1.5V
 
 binary_sensor:
   - platform: esp32_touch

tests/components/esp32_touch/test.esp32-p4-idf.yaml

@@ -0,0 +1,5 @@
+substitutions:
+  pin: GPIO5
+
+<<: !include common-variants.yaml
+<<: !include common-get-value.yaml

tests/components/gps/common.yaml

@@ -1,8 +1,15 @@
 gps:
   latitude:
     name: "Latitude"
+    id: gps_lat
+    on_value:
+      then:
+        - logger.log:
+            format: "%.6f, %.6f"
+            args: [id(gps_lat).state, id(gps_long).state]
   longitude:
     name: "Longitude"
+    id: gps_long
   altitude:
     name: "Altitude"
   speed:

tests/components/safe_mode/common-enabled.yaml

@@ -16,3 +16,7 @@ button:
 switch:
   - platform: safe_mode
     name: Safe Mode Switch
+
+esphome:
+  on_boot:
+    - safe_mode.mark_successful

tests/components/sen6x/common.yaml

@@ -0,0 +1,37 @@
+sensor:
+  # Test with explicit type parameter
+  - platform: sen6x
+    id: sen6x_sensor
+    type: SEN69C
+    i2c_id: i2c_bus
+    temperature:
+      name: Temperature
+      accuracy_decimals: 1
+    humidity:
+      name: Humidity
+      accuracy_decimals: 0
+    pm_1_0:
+      name: PM <1µm Weight concentration
+      id: sen6x_pm_1_0
+      accuracy_decimals: 1
+    pm_2_5:
+      name: PM <2.5µm Weight concentration
+      id: sen6x_pm_2_5
+      accuracy_decimals: 1
+    pm_4_0:
+      name: PM <4µm Weight concentration
+      id: sen6x_pm_4_0
+      accuracy_decimals: 1
+    pm_10_0:
+      name: PM <10µm Weight concentration
+      id: sen6x_pm_10_0
+      accuracy_decimals: 1
+    nox:
+      name: NOx
+    voc:
+      name: VOC
+    co2:
+      name: Carbon Dioxide
+    formaldehyde:
+      name: Formaldehyde
+    address: 0x6B

tests/components/sen6x/test.esp32-idf.yaml

@@ -0,0 +1,4 @@
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-idf.yaml
+
+<<: !include common.yaml

tests/components/sen6x/test.esp8266-ard.yaml

@@ -0,0 +1,4 @@
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp8266-ard.yaml
+
+<<: !include common.yaml

tests/components/sen6x/test.rp2040-ard.yaml

@@ -0,0 +1,4 @@
+packages:
+  i2c: !include ../../test_build_components/common/i2c/rp2040-ard.yaml
+
+<<: !include common.yaml

tests/components/socket/test_wake_loop_threadsafe.py

@@ -1,9 +1,14 @@
+import pytest
+
 from esphome.components import socket
 from esphome.const import (
     KEY_CORE,
     KEY_TARGET_PLATFORM,
+    PLATFORM_BK72XX,
     PLATFORM_ESP32,
     PLATFORM_ESP8266,
+    PLATFORM_LN882X,
+    PLATFORM_RTL87XX,
 )
 from esphome.core import CORE
 
@@ -90,9 +95,15 @@ def test_require_wake_loop_threadsafe__no_networking_does_not_consume_socket() -
     assert udp_consumers == initial_udp
 
 
-def test_require_wake_loop_threadsafe__esp32_no_udp_socket() -> None:
-    """Test that ESP32 uses task notifications instead of UDP socket."""
-    _setup_platform(PLATFORM_ESP32)
+@pytest.mark.parametrize(
+    "platform",
+    [PLATFORM_ESP32, PLATFORM_BK72XX, PLATFORM_RTL87XX, PLATFORM_LN882X],
+)
+def test_require_wake_loop_threadsafe__fast_select_no_udp_socket(
+    platform: str,
+) -> None:
+    """Test that fast select platforms use task notifications instead of UDP socket."""
+    _setup_platform(platform)
     CORE.config = {"wifi": True}
     socket.require_wake_loop_threadsafe()
 
@@ -100,13 +111,13 @@ def test_require_wake_loop_threadsafe__esp32_no_udp_socket() -> None:
     assert CORE.data[socket.KEY_WAKE_LOOP_THREADSAFE_REQUIRED] is True
     assert any(d.name == "USE_WAKE_LOOP_THREADSAFE" for d in CORE.defines)
 
-    # Verify no UDP socket was consumed (ESP32 uses FreeRTOS task notifications)
+    # Verify no UDP socket was consumed (fast select platforms use FreeRTOS task notifications)
     udp_consumers = CORE.data.get(socket.KEY_SOCKET_CONSUMERS_UDP, {})
     assert "socket.wake_loop_threadsafe" not in udp_consumers
 
 
-def test_require_wake_loop_threadsafe__non_esp32_consumes_udp_socket() -> None:
-    """Test that non-ESP32 platforms consume a UDP socket for wake notifications."""
+def test_require_wake_loop_threadsafe__non_fast_select_consumes_udp_socket() -> None:
+    """Test that platforms without fast select consume a UDP socket for wake notifications."""
     _setup_platform(PLATFORM_ESP8266)
     CORE.config = {"wifi": True}
     socket.require_wake_loop_threadsafe()

tests/components/wifi/test.bk72xx-ard.yaml

@@ -0,0 +1 @@
+<<: !include common.yaml

tests/components/wifi/test.ln882x-ard.yaml

@@ -0,0 +1 @@
+<<: !include common.yaml

tests/components/wifi/test.rtl87xx-ard.yaml

@@ -0,0 +1 @@
+<<: !include common.yaml

tests/dummy_main.cpp

@@ -16,10 +16,10 @@ void setup() {
   auto *log = new logger::Logger(115200);  // NOLINT
   log->pre_setup();
   log->set_uart_selection(logger::UART_SELECTION_UART0);
-  App.register_component(log);
+  App.register_component_(log);
 
   auto *wifi = new wifi::WiFiComponent();  // NOLINT
-  App.register_component(wifi);
+  App.register_component_(wifi);
   wifi::WiFiAP ap;
   ap.set_ssid("Test SSID");
   ap.set_password("password1");

tests/unit_tests/test_cpp_helpers.py

@@ -16,7 +16,7 @@ async def test_gpio_pin_expression__conf_is_none(monkeypatch):
 async def test_register_component(monkeypatch):
     var = Mock(base="foo.bar")
 
-    app_mock = Mock(register_component=Mock(return_value=var))
+    app_mock = Mock(register_component_=Mock(return_value=var))
     monkeypatch.setattr(ch, "App", app_mock)
 
     core_mock = Mock(component_ids=["foo.bar"])
@@ -29,7 +29,7 @@ async def test_register_component(monkeypatch):
 
     assert actual is var
     assert add_mock.call_count == 2
-    app_mock.register_component.assert_called_with(var)
+    app_mock.register_component_.assert_called_with(var)
     assert core_mock.component_ids == []
 
 
@@ -48,7 +48,7 @@ async def test_register_component__no_component_id(monkeypatch):
 async def test_register_component__with_setup_priority(monkeypatch):
     var = Mock(base="foo.bar")
 
-    app_mock = Mock(register_component=Mock(return_value=var))
+    app_mock = Mock(register_component_=Mock(return_value=var))
     monkeypatch.setattr(ch, "App", app_mock)
 
     core_mock = Mock(component_ids=["foo.bar"])
@@ -68,5 +68,5 @@ async def test_register_component__with_setup_priority(monkeypatch):
     assert actual is var
     add_mock.assert_called()
     assert add_mock.call_count == 4
-    app_mock.register_component.assert_called_with(var)
+    app_mock.register_component_.assert_called_with(var)
     assert core_mock.component_ids == []