github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-07 11:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pin the LOW_MEMORY lwIP fall-through, veto the stamp on a stuck stale note

Browse Source 
LOW_MEMORY is upstream's else branch, so the default variant stands in
for it and every listed knob wins -- pinned for the ordinary SNTP
multi-server config where esp8266's HIGHER_BANDWIDTH_LOW_FLASH must
prevail. A stale warn note that cannot be removed now vetoes the stamp
(mirror of the lost-note case), and the unreadable-cached-note warning
names its cause.
This commit is contained in:
J. Nick Koston
2026-08-23 13:51:54 -05:00
parent 9766f6e911
commit 6b5b13c17e
2 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit_tests/build_gen/test_arduino8266.py
+45
View File
@@ -219,6 +219,8 @@ def _make_framework(tmp_path: Path) -> InstalledPaths:
),
("PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH", "lwip2-1460-feat", 1460, 1, 0),
("PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH", "lwip2-536", 536, 0, 0),
# LOW_MEMORY has no upstream branch: it is the default (else) variant
("PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY", "lwip2-536-feat", 536, 1, 0),
],
)
def test_build_config_lwip_variants(
@@ -233,6 +235,17 @@ def test_build_config_lwip_variants(
assert f"LWIP_IPV6={ipv6}" in config.knob_defines
def test_lwip_low_memory_loses_to_listed_knobs() -> None:
"""The ordinary SNTP multi-server config: sntp emits LOW_MEMORY, esp8266
always emits HIGHER_BANDWIDTH_LOW_FLASH, and the listed knob must win
exactly as in platformio-build.py's elif chain."""
config = _resolve(
"-DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY",
"-DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH",
)
assert config.lwip_lib == "lwip2-1460"
@pytest.mark.parametrize(
("knob", "expected"),
[
@@ -657,6 +670,38 @@ def test_generate_ld_scripts_lost_warn_note_vetoes_the_stamp(
assert caplog.text.count("Linker-script preprocessor: warning: something") == 2
def test_generate_ld_scripts_unremovable_stale_note_vetoes_the_stamp(
tmp_path: Path, caplog: pytest.LogCaptureFixture
) -> None:
"""A stale warn note that cannot be removed skips the stamp, so the
obsolete diagnostic is not re-emitted on cache hits forever."""
paths = _make_framework(tmp_path)
_set_flags()
warn = MagicMock(returncode=0, stdout=_COMMON_LD_H_OUTPUT, stderr="warning: old")
clean = MagicMock(returncode=0, stdout=_COMMON_LD_H_OUTPUT, stderr="")
with patch.object(arduino8266.subprocess, "run", return_value=warn):
_run_generate_ld_scripts(paths)
real_unlink = Path.unlink
def fail_note_unlink(self: Path, missing_ok: bool = False) -> None:
if self.name.endswith(".stderr"):
raise OSError("locked")
real_unlink(self, missing_ok=missing_ok)
# Flags changed -> regenerate; clean stderr but the stale note is stuck
_set_flags("-DVTABLES_IN_DRAM")
with (
patch.object(arduino8266.subprocess, "run", return_value=clean),
patch.object(Path, "unlink", fail_note_unlink),
):
_run_generate_ld_scripts(paths)
# Unstamped: the next build re-runs -E instead of trusting the cache
with patch.object(arduino8266.subprocess, "run", return_value=clean) as run3:
_run_generate_ld_scripts(paths)
run3.assert_called_once()
def test_build_config_mmu_knob_with_raw_mmu_flag_raises() -> None:
"""A variant knob plus a raw MMU_* define would split the compile line
from the linker script; refuse like the no-knob case."""