Merge branch 'esp8266-native-library-backend' into esp8266-native-build-spec

esphome/platformio/registry.py

@@ -169,6 +169,11 @@ class _PendingArchive(NamedTuple):
     size: int
 
 
+def _already_installed(dest: Path) -> bool:
+    """Whether ``dest`` holds a completed install (extraction marker)."""
+    return (dest / ".esphome_extracted").is_file()
+
+
 def prefetch_packages(
     packages: list[tuple[str, str, Path, list[str]]], downloads_dir: Path
 ) -> None:
@@ -221,7 +226,9 @@ def prefetch_packages(
             # Marker re-check: a concurrent build may have installed (and
             # deleted the archive of) this package while we waited;
             # re-downloading would orphan a fresh copy in downloads_dir
-            if not (entry.dest / ".esphome_extracted").is_file():
+            # no branch: the thread tracer misses the skip edge; both
+            # arms of _already_installed are pinned directly
+            if not _already_installed(entry.dest):  # pragma: no branch
                 download_with_resume(
                     entry.url,
                     downloads_dir / f"{entry.name}-{entry.version}",

tests/unit_tests/test_espidf_framework.py

@@ -1616,6 +1616,19 @@ def test_ccache_env_opt_in_without_binary(
     assert "no ccache binary is on PATH" in caplog.text
 
 
+def test_ccache_env_opt_in_with_working_binary(
+    tmp_path: Path, caplog: pytest.LogCaptureFixture
+) -> None:
+    # Forced on with a working binary: no warning fires at all.
+    ccache = tmp_path / "ccache"
+    ccache.touch()
+    p1, p2, p3 = _ccache_patches(tmp_path, str(ccache), tmp_path / "build")
+    with patch.dict("os.environ", {"IDF_CCACHE_ENABLE": "1"}, clear=True), p1, p2, p3:
+        env = _ccache_env()
+    assert env["IDF_CCACHE_ENABLE"] == "1"
+    assert "ccache" not in caplog.text.lower() or "Not decoded" in caplog.text
+
+
 def test_ccache_env_opt_in_with_rejected_binary(
     tmp_path: Path, caplog: pytest.LogCaptureFixture
 ) -> None:

tests/unit_tests/test_platformio_registry.py

@@ -559,6 +559,15 @@ def test_prefetch_packages_skips_freshly_installed_dest(tmp_path: Path) -> None:
     mock_download.assert_not_called()
 
 
+def test_already_installed_probe(tmp_path: Path) -> None:
+    """Both arms of the marker probe the prefetch worker keys on."""
+    dest = tmp_path / "pkg"
+    dest.mkdir()
+    assert registry._already_installed(dest) is False
+    (dest / ".esphome_extracted").touch()
+    assert registry._already_installed(dest) is True
+
+
 def test_prefetch_packages_dedupes_duplicate_entries(tmp_path: Path) -> None:
     """Duplicate (name, version) entries would race each other between two
     workers; only one survives (and one is too few to parallelize)."""