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

tests/unit_tests/build_helpers/test_ccache.py

@@ -109,6 +109,9 @@ def test_resolve_unrecognized_value_warns_and_probes(
         ("disable", False),
         ("Off", False),
         ("maybe", None),
+        # ENV KNOB= (Docker/CI) has always read as a disable
+        ("", False),
+        ("   ", False),
     ],
 )
 def test_parse_enable_env_spelling_tables(

tests/unit_tests/test_espidf_framework.py

@@ -1564,7 +1564,8 @@ def test_ccache_env_disabled_when_binary_missing(tmp_path: Path) -> None:
     # build_path is None here too: a disabled cache must not require it.
     p1, p2, p3 = _ccache_patches(tmp_path, None, None)
     with patch.dict("os.environ", {}, clear=True), p1, p2, p3:
-        assert _ccache_env() == {}
+        # Canonical off, so an inherited/unparsable value cannot enable it
+        assert _ccache_env() == {"IDF_CCACHE_ENABLE": "0"}
 
 
 def test_ccache_env_opt_out_via_env(tmp_path: Path) -> None:
@@ -1578,12 +1579,12 @@ def test_ccache_env_opt_out_via_env(tmp_path: Path) -> None:
 
 
 def test_ccache_env_opt_in_without_binary(tmp_path: Path) -> None:
-    # Explicit IDF_CCACHE_ENABLE=1 forces it on without probing PATH. It's
-    # already in the environment, so it isn't re-emitted, but the rest is.
+    # Explicit IDF_CCACHE_ENABLE=1 forces it on; the probe verdict is
+    # ignored but the resolver still runs for its no-binary warning.
     p1, p2, p3 = _ccache_patches(tmp_path, None, tmp_path / "build")
     with patch.dict("os.environ", {"IDF_CCACHE_ENABLE": "1"}, clear=True), p1, p2, p3:
         env = _ccache_env()
-    assert "IDF_CCACHE_ENABLE" not in env
+    assert env["IDF_CCACHE_ENABLE"] == "1"
     assert env["CCACHE_DIR"] == str(tmp_path / "tools" / "ccache")
     assert env["CCACHE_DEPEND"] == "1"
 
@@ -1595,7 +1596,7 @@ def test_ccache_env_honors_shared_esphome_opt_out(tmp_path: Path) -> None:
     env_vars = {"ESPHOME_CCACHE_ENABLE": "0", "PATH": "/usr/bin"}
     with patch.dict("os.environ", env_vars, clear=True), p2, p3:
         # The real resolver runs so the opt-out parse is exercised
-        assert _ccache_env() == {}
+        assert _ccache_env() == {"IDF_CCACHE_ENABLE": "0"}
 
 
 @pytest.mark.parametrize("value", ["off", "no"])
@@ -1627,7 +1628,7 @@ def test_ccache_env_idf_knob_wins_over_shared_opt_out(tmp_path: Path) -> None:
     with patch.dict("os.environ", env_vars, clear=True), p1, p2, p3:
         env = _ccache_env()
     assert env["CCACHE_DIR"] == str(tmp_path / "tools" / "ccache")
-    assert "IDF_CCACHE_ENABLE" not in env
+    assert env["IDF_CCACHE_ENABLE"] == "1"
 
 
 def test_ccache_env_preserves_user_overrides(tmp_path: Path) -> None:

tests/unit_tests/test_platformio_registry.py

@@ -14,6 +14,44 @@ from esphome.core import EsphomeError
 from esphome.platformio import registry
 
 
+def test_registry_download_resolves_once_per_process() -> None:
+    """The prefetch and the install share one metadata resolve per package."""
+    calls: list[dict] = []
+    payload = {
+        "versions": [
+            {
+                "name": "1.0.0",
+                "files": [
+                    {
+                        "download_url": "http://x/pkg.tar.gz",
+                        "checksum": {"sha256": "ab" * 32},
+                        "size": 5,
+                    }
+                ],
+            }
+        ]
+    }
+
+    def fake_download(mirrors, substitutions, target):
+        calls.append(substitutions)
+        target.write(json.dumps(payload).encode())
+        return mirrors[0]
+
+    with patch.object(registry, "download_from_mirrors", side_effect=fake_download):
+        first = registry.registry_download("o/pkg", "1.0.0")
+        second = registry.registry_download("o/pkg", "1.0.0")
+    assert first == second
+    assert len(calls) == 1
+
+
+@pytest.fixture(autouse=True)
+def _fresh_registry_cache():
+    # registry_download memoizes per process; tests reuse package names
+    registry.registry_download.cache_clear()
+    yield
+    registry.registry_download.cache_clear()
+
+
 @pytest.mark.parametrize(
     ("system", "machine", "expected"),
     [