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

tests/unit_tests/build_helpers/test_idedata.py

@@ -11,6 +11,7 @@ from unittest.mock import MagicMock, patch
 import pytest
 
 from esphome.build_helpers import idedata
+from esphome.core import EsphomeError
 
 # An absolute, forward-slash (shlex-safe) path prefix valid on the host OS, so
 # tests exercise the same is-absolute / normalize behavior as a real compile DB
@@ -427,11 +428,9 @@ def test_load_or_build_idedata_corrupted_cache_is_logged(
     assert "Discarding unreadable idedata cache" in caplog.text
 
 
-def test_load_or_build_idedata_never_caches_a_launcher(
-    tmp_path: Path, caplog: pytest.LogCaptureFixture
-) -> None:
-    """Idedata whose compiler path is a known launcher is served for this
-    run but not persisted, so the next build re-parses."""
+def test_load_or_build_idedata_never_caches_a_launcher(tmp_path: Path) -> None:
+    """A compile DB naming a launcher as the compiler is rejected by name,
+    before the toolchain probe could fail opaquely, and never cached."""
     compile_commands = tmp_path / "compile_commands.json"
     compile_commands.write_text(
         json.dumps(
@@ -445,13 +444,10 @@ def test_load_or_build_idedata_never_caches_a_launcher(
         )
     )
     cache = tmp_path / "c.json"
-    with patch.object(idedata, "get_toolchain_includes", return_value=[]):
-        data = idedata.load_or_build_idedata(
-            compile_commands, tmp_path / "f.elf", cache
-        )
-    assert data is None
+    # No probe patch needed: the launcher is rejected before the probe runs
+    with pytest.raises(EsphomeError, match="compile database is unusable"):
+        idedata.load_or_build_idedata(compile_commands, tmp_path / "f.elf", cache)
     assert not cache.exists()
-    assert "no usable idedata" in caplog.text
 
 
 def test_load_or_build_idedata_cache_hit_skips_rebuild(tmp_path: Path) -> None:

tests/unit_tests/test_platformio_extra_script.py

@@ -224,7 +224,7 @@ def test_apply_extra_script_swallows_script_errors(tmp_path, caplog) -> None:
     c.data = {"build": {"extraScript": "extra.py"}}
     apply_extra_script(c, board_mcu=lambda: "esp8266", pio_platform="espressif8266")
     assert "flags" not in c.data["build"]
-    assert "keeping the partial capture" in caplog.text
+    assert "ignoring its output" in caplog.text
 
 
 def test_apply_extra_script_pio_platform(tmp_path) -> None:
@@ -252,8 +252,9 @@ def test_apply_extra_script_missing_script_logged(tmp_path, caplog) -> None:
     assert "not found" in caplog.text
 
 
-def test_run_extra_script_keeps_partial_capture(tmp_path, caplog) -> None:
-    """Flags appended before a script fails are kept, not dropped."""
+def test_run_extra_script_failure_discards_partial_capture(tmp_path, caplog) -> None:
+    """A crashed script yields an empty result: half-applied flags could
+    build wrong-output firmware that links cleanly."""
     from esphome.platformio.extra_script import run_extra_script
 
     script = tmp_path / "extra.py"
@@ -261,8 +262,8 @@ def test_run_extra_script_keeps_partial_capture(tmp_path, caplog) -> None:
     result = run_extra_script(
         script, library_dir=tmp_path, board_mcu="esp32", pio_platform="espressif32"
     )
-    assert result.libs == ["algobsec"]
-    assert "keeping the partial capture" in caplog.text
+    assert result.libs == []
+    assert "ignoring its output" in caplog.text
 
 
 def test_run_extra_script_syntax_error_is_best_effort(tmp_path, caplog) -> None:
@@ -276,4 +277,4 @@ def test_run_extra_script_syntax_error_is_best_effort(tmp_path, caplog) -> None:
         script, library_dir=tmp_path, board_mcu="esp32", pio_platform="espressif32"
     )
     assert result.libs == []
-    assert "keeping the partial capture" in caplog.text
+    assert "ignoring its output" in caplog.text