github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-06 02:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store the native version floor as a Version and tidy the dependency skip

Browse Source
This commit is contained in:
J. Nick Koston
2026-08-20 05:25:25 -05:00
parent ff7161d7eb
commit 2483117648
4 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit_tests/components/esp8266/test_toolchain_validation.py
+16 -7
View File
@@ -27,8 +27,17 @@ def _arduino_toolchain() -> None:
CORE.toolchain = Toolchain.ARDUINO
def _config(board: str = "nodemcuv2", **framework: str) -> ConfigType:
framework.setdefault(CONF_VERSION, "3.1.2")
def _config(
board: str = "nodemcuv2",
version: str = "3.1.2",
source: str | None = None,
platform_version: str | None = None,
) -> ConfigType:
framework: dict[str, str] = {CONF_VERSION: version}
if source is not None:
framework[CONF_SOURCE] = source
if platform_version is not None:
framework[CONF_PLATFORM_VERSION] = platform_version
# The real schema fills the source/platform_version defaults, so these
# tests validate against what config validation actually emits
return {
@@ -44,24 +53,24 @@ def test_valid_config_passes() -> None:
def test_platformio_toolchain_skips_checks() -> None:
CORE.toolchain = Toolchain.PLATFORMIO
config = _config(board="not_a_board", **{CONF_VERSION: "2.7.4"})
config = _config(board="not_a_board", version="2.7.4")
assert _validate_native_toolchain(config) is config
def test_version_below_floor_rejected() -> None:
# 3.1.0 has no registry package, so the native floor is 3.1.1
with pytest.raises(cv.Invalid, match="3.1.1 or newer"):
_validate_native_toolchain(_config(**{CONF_VERSION: "3.1.0"}))
_validate_native_toolchain(_config(version="3.1.0"))
def test_version_at_floor_accepted() -> None:
_validate_native_toolchain(_config(**{CONF_VERSION: "3.1.1"}))
_validate_native_toolchain(_config(version="3.1.1"))
def test_custom_platform_version_warns_and_is_dropped(
caplog: pytest.LogCaptureFixture,
) -> None:
config = _config(**{CONF_PLATFORM_VERSION: "platformio/espressif8266@4.0.1"})
config = _config(platform_version="platformio/espressif8266@4.0.1")
_validate_native_toolchain(config)
assert "'platform_version' is ignored" in caplog.text
assert CONF_PLATFORM_VERSION not in config[CONF_FRAMEWORK]
@@ -79,7 +88,7 @@ def test_default_platform_version_does_not_warn(
def test_custom_source_rejected() -> None:
with pytest.raises(cv.Invalid, match="custom framework source"):
_validate_native_toolchain(
_config(**{CONF_SOURCE: "https://github.com/esp8266/Arduino.git"})
_config(source="https://github.com/esp8266/Arduino.git")
)