Hoist find_ninja to build_helpers, type the installed paths, dedupe espidf ccache env

tests/unit_tests/build_helpers/test_ninja.py

@@ -0,0 +1,50 @@
+"""Tests for esphome.build_helpers.ninja."""
+
+from __future__ import annotations
+
+import os
+from pathlib import Path
+import sys
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from esphome.build_helpers import ninja as ninja_helper
+from esphome.core import EsphomeError
+
+
+def test_find_ninja_prefers_path(tmp_path: Path) -> None:
+    with patch("shutil.which", return_value=str(tmp_path / "ninja")):
+        assert ninja_helper.find_ninja() == tmp_path / "ninja"
+
+
+def test_find_ninja_falls_back_to_wheel(tmp_path: Path) -> None:
+    """Without a PATH entry, the ninja PyPI wheel's binary is used."""
+    binary_name = "ninja.exe" if os.name == "nt" else "ninja"
+    (tmp_path / binary_name).touch()
+    wheel = MagicMock(BIN_DIR=str(tmp_path))
+    with (
+        patch("shutil.which", return_value=None),
+        patch.dict(sys.modules, {"ninja": wheel}),
+    ):
+        assert ninja_helper.find_ninja() == tmp_path / binary_name
+
+
+def test_find_ninja_package_not_installed() -> None:
+    """A missing ninja package raises the actionable message, not ImportError."""
+    with (
+        patch("shutil.which", return_value=None),
+        patch.dict(sys.modules, {"ninja": None}),
+        pytest.raises(EsphomeError, match="ninja not found"),
+    ):
+        ninja_helper.find_ninja()
+
+
+def test_find_ninja_missing_everywhere(tmp_path: Path) -> None:
+    wheel = MagicMock(BIN_DIR=str(tmp_path))
+    with (
+        patch("shutil.which", return_value=None),
+        patch.dict(sys.modules, {"ninja": wheel}),
+        pytest.raises(EsphomeError, match="ninja not found"),
+    ):
+        ninja_helper.find_ninja()

tests/unit_tests/test_arduino8266_framework.py

@@ -5,8 +5,7 @@ from __future__ import annotations
 import os
 from pathlib import Path
 import subprocess
-import sys
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 import pytest
 
@@ -36,55 +35,16 @@ def test_tools_path_default_and_prefix(tmp_path: Path) -> None:
     assert path != Path.cwd()
 
 
-def test_find_ninja_prefers_path(tmp_path: Path) -> None:
-    with patch("shutil.which", return_value=str(tmp_path / "ninja")):
-        assert framework._find_ninja() == tmp_path / "ninja"
-
-
-def test_find_ninja_falls_back_to_wheel(tmp_path: Path) -> None:
-    """Without a PATH entry, the ninja PyPI wheel's binary is used."""
-    binary_name = "ninja.exe" if os.name == "nt" else "ninja"
-    (tmp_path / binary_name).touch()
-    wheel = MagicMock(BIN_DIR=str(tmp_path))
-    with (
-        patch("shutil.which", return_value=None),
-        patch.dict(sys.modules, {"ninja": wheel}),
-    ):
-        assert framework._find_ninja() == tmp_path / binary_name
-
-
-def test_find_ninja_package_not_installed() -> None:
-    """A missing ninja package raises the actionable message, not ImportError."""
-    with (
-        patch("shutil.which", return_value=None),
-        patch.dict(sys.modules, {"ninja": None}),
-        pytest.raises(EsphomeError, match="ninja not found"),
-    ):
-        framework._find_ninja()
-
-
-def test_find_ninja_missing_everywhere(tmp_path: Path) -> None:
-    wheel = MagicMock(BIN_DIR=str(tmp_path))
-    with (
-        patch("shutil.which", return_value=None),
-        patch.dict(sys.modules, {"ninja": wheel}),
-        pytest.raises(EsphomeError, match="ninja not found"),
-    ):
-        framework._find_ninja()
-
-
 def test_check_and_install_returns_paths(tmp_path: Path) -> None:
     with (
         patch.dict(os.environ, {"ESPHOME_ARDUINO8266_PREFIX": str(tmp_path)}),
         patch.object(framework, "install_package") as mock_install,
-        patch.object(framework, "_find_ninja", return_value=tmp_path / "ninja"),
+        patch.object(framework, "find_ninja", return_value=tmp_path / "ninja"),
     ):
         paths = framework.check_and_install(cv.Version(3, 1, 2))
-    assert paths["framework_path"] == tmp_path / "frameworks" / "3.30102.0"
-    assert (
-        paths["toolchain_path"] == tmp_path / "toolchains" / framework.TOOLCHAIN_VERSION
-    )
-    assert paths["ninja_path"] == tmp_path / "ninja"
+    assert paths.framework == tmp_path / "frameworks" / "3.30102.0"
+    assert paths.toolchain == tmp_path / "toolchains" / framework.TOOLCHAIN_VERSION
+    assert paths.ninja == tmp_path / "ninja"
     assert mock_install.call_count == 2
     # The layout checks cover the directories write_project needs, including
     # the bundled libraries/ tree

tests/unit_tests/test_espidf_framework.py

@@ -1400,8 +1400,9 @@ def _ccache_patches(tmp_path: Path, which: str | None, build_path: Path | None):
             "esphome.espidf.framework.get_idf_tools_path",
             return_value=tmp_path / "tools",
         ),
+        # ccache_defaults_env (framework_helpers) reads CORE at call time
         patch(
-            "esphome.espidf.framework.CORE",
+            "esphome.core.CORE",
             SimpleNamespace(build_path=build_path),
         ),
     )