Merge branch 'esp8266-native-ninja-emission' into esp8266-arduino-toolchain

# Conflicts:
#	esphome/components/esp8266/__init__.py

tests/unit_tests/components/esp8266/test_boards.py

@@ -1,11 +1,7 @@
 """Tests for the per-board linker-script rule."""
 
-import pytest
-
 from esphome.components.esp8266 import _choose_ld_script
 from esphome.components.esp8266.boards import BOARDS, board_ld_script
-import esphome.config_validation as cv
-from esphome.core import EsphomeError
 
 
 def test_d1_wroom_02_keeps_its_shipped_layout() -> None:
@@ -21,13 +17,6 @@ def test_default_boards_use_the_flash_size_layout() -> None:
 
 
 def test_choose_ld_script_paths() -> None:
-    """Old cores get the size default, overriding boards hard-error there
-    (a substituted layout would wipe flash-backed state), modern cores
-    honor the override."""
-    assert _choose_ld_script("nodemcuv2", cv.Version(2, 3, 0)) is None
-    assert _choose_ld_script("nodemcuv2", cv.Version(2, 4, 2)) == "eagle.flash.4m.ld"
-    assert _choose_ld_script("d1_wroom_02", cv.Version(2, 7, 4)) == (
-        "eagle.flash.2m64.ld"
-    )
-    with pytest.raises(EsphomeError, match="cannot honor"):
-        _choose_ld_script("d1_wroom_02", cv.Version(2, 4, 2))
+    """Default boards get the size layout, overriding boards keep theirs."""
+    assert _choose_ld_script("nodemcuv2") == "eagle.flash.4m.ld"
+    assert _choose_ld_script("d1_wroom_02") == "eagle.flash.2m64.ld"

tests/unit_tests/components/esp8266/test_framework_version.py

@@ -0,0 +1,23 @@
+"""Tests for the Arduino framework version floor."""
+
+import pytest
+
+from esphome.components.esp8266 import _arduino_check_versions
+import esphome.config_validation as cv
+from esphome.const import CONF_PLATFORM_VERSION, CONF_VERSION
+
+
+def test_versions_before_3_are_rejected() -> None:
+    with pytest.raises(cv.Invalid, match="no longer supported") as excinfo:
+        _arduino_check_versions({CONF_VERSION: "2.7.4"})
+    assert excinfo.value.path == [CONF_VERSION]
+
+
+def test_supported_versions_pass() -> None:
+    value = _arduino_check_versions({CONF_VERSION: "3.0.2"})
+    assert value[CONF_VERSION] == "3.0.2"
+    assert "espressif8266@3.2.0" in value[CONF_PLATFORM_VERSION]
+
+    value = _arduino_check_versions({CONF_VERSION: "recommended"})
+    assert value[CONF_VERSION] == "3.1.2"
+    assert "espressif8266@4.2.1" in value[CONF_PLATFORM_VERSION]

tests/unit_tests/components/esp8266/test_toolchain_validation.py

@@ -63,8 +63,10 @@ def test_valid_config_passes() -> None:
 
 
 def test_platformio_toolchain_skips_checks() -> None:
+    # 3.0.2 is pio-legal (>= the global 3.0.0 floor) but below the native
+    # toolchain's own 3.1.1 floor; the bogus board only the native path checks
     CORE.toolchain = Toolchain.PLATFORMIO
-    config = _config(board="not_a_board", version="2.7.4")
+    config = _config(board="not_a_board", version="3.0.2")
     assert _validate_native_toolchain(config) is config
 
 

tests/unit_tests/test_arduino8266_framework.py

@@ -21,17 +21,12 @@ def _build_path(tmp_path: Path) -> None:
 def test_framework_package_version() -> None:
     assert framework.framework_package_version(cv.Version(3, 1, 2)) == "3.30102.0"
     assert framework.framework_package_version(cv.Version(3, 2, 0)) == "3.30200.0"
-    # 2.6.3+ cores use the same package-major-3 encoding (PlatformIO path)
-    assert framework.framework_package_version(cv.Version(2, 7, 4)) == "3.20704.0"
     # A future major bump needs its own encoding, not a doomed registry lookup
     with pytest.raises(EsphomeError, match="not supported yet"):
         framework.framework_package_version(cv.Version(4, 0, 0))
-    # The boundary matches the PlatformIO era guard; a 2.6.2 pre-release
-    # keeps this encoding
-    with pytest.raises(EsphomeError, match="older package encoding"):
-        framework.framework_package_version(cv.Version(2, 6, 2))
-    assert framework.framework_package_version(cv.Version(2, 6, 2, "b1")) == "3.20602.0"
-    assert framework.framework_package_version(cv.Version(2, 6, 3)) == "3.20603.0"
+    # Cores before 3.x cannot build ESPHome (C++20) and are rejected
+    with pytest.raises(EsphomeError, match="requires core 3"):
+        framework.framework_package_version(cv.Version(2, 7, 4))
 
 
 def test_format_framework_arduino_version_pins_all_series() -> None:
@@ -39,10 +34,10 @@ def test_format_framework_arduino_version_pins_all_series() -> None:
     era, including the 4.x rejection it now shares with the installer."""
     from esphome.components.esp8266 import _format_framework_arduino_version as fmt
 
-    assert fmt(cv.Version(2, 4, 1)) == "~1.20401.0"
-    assert fmt(cv.Version(2, 6, 2)) == "~2.20602.0"
-    assert fmt(cv.Version(2, 7, 4)) == "~3.20704.0"
     assert fmt(cv.Version(3, 1, 2)) == "~3.30102.0"
+    # Pre-3 cores are rejected with the version line anchored
+    with pytest.raises(cv.Invalid, match="requires core 3"):
+        fmt(cv.Version(2, 7, 4))
     # Anchored to the framework version line, not a bare EsphomeError
     with pytest.raises(cv.Invalid, match="not supported yet") as excinfo:
         fmt(cv.Version(4, 0, 0))