Simplify batch failure logging and dedupe test scaffolding

tests/unit_tests/test_framework_helpers.py

@@ -2345,35 +2345,34 @@ def test_resume_fetch_job_threads_tracker(tmp_path: Path) -> None:
     )
 
 
-def test_warn_prefetch_failures_names_each_failure(
+def test_warn_batch_failures_names_each_failure(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """The shared failure loop warns per job with the failure reason."""
-    from esphome.framework_helpers import warn_prefetch_failures
+    from esphome.framework_helpers import warn_batch_failures
 
-    warn_prefetch_failures([("toolchain-x@1", OSError("down"))])
+    warn_batch_failures([("toolchain-x@1", OSError("down"))])
     assert "Could not prefetch toolchain-x@1: down" in caplog.text
-    warn_prefetch_failures([("lib", OSError("gone"))], "Prefetch of %s failed: %s")
+    warn_batch_failures([("lib", OSError("gone"))], "Prefetch of %s failed: %s")
     assert "Prefetch of lib failed: gone" in caplog.text
 
 
-def test_warn_prefetch_failures_unexpected_error_keeps_traceback(
+def test_warn_batch_failures_unexpected_error_keeps_traceback(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """An unexpected error type is not reduced to a bare message; expected
     download failures stay message-only at WARNING."""
-    from esphome.framework_helpers import warn_prefetch_failures
+    from esphome.framework_helpers import warn_batch_failures
 
     with caplog.at_level(logging.DEBUG):
-        warn_prefetch_failures(
+        warn_batch_failures(
             [("pkg", TypeError("bad call")), ("lib", OSError("down"))],
             "Could not install %s: %s",
-            detail="Install failure detail",
         )
     warnings = {r.getMessage(): r for r in caplog.records if r.levelname == "WARNING"}
     assert warnings["Could not install pkg: bad call"].exc_info is not None
     assert warnings["Could not install lib: down"].exc_info is None
-    assert "Install failure detail" in caplog.text
+    assert "Failure detail" in caplog.text
 
 
 @pytest.mark.parametrize(

tests/unit_tests/test_platformio_prefetch.py

@@ -1735,44 +1735,12 @@ def test_preinstall_caps_workers(
     tmp_path: Path, caplog: pytest.LogCaptureFixture
 ) -> None:
     """A high core count is capped; the workers share one disk."""
-
-    class _Mgr:
-        package_dir = str(tmp_path)
-        compatibility = None
-
-        def __init__(self, package_dir, **kwargs) -> None:
-            pass
-
-        def lock(self) -> None:
-            pass
-
-        def unlock(self) -> None:
-            pass
-
-        def memcache_reset(self) -> None:
-            pass
-
-        def get_tmp_dir(self) -> str:
-            return str(tmp_path)
-
-        def get_download_dir(self) -> str:
-            return str(tmp_path)
-
-        def get_package(self, spec):
-            return None
-
-        def get_pkg_dependencies(self, pkg):
-            return None
-
-        def _install(self, spec, skip_dependencies, compatibility=None) -> None:
-            pass
-
     with (
         caplog.at_level(logging.INFO),
         patch.object(pf, "get_usable_cpu_count", return_value=64),
     ):
         pf._preinstall(
-            _Mgr(str(tmp_path)),
+            _fake_manager(tmp_path),
             [(f"p{i}@1", _FakeSpec(name=f"p{i}")) for i in range(11)],
         )
     assert "Installing 11 PlatformIO package(s) with 10 extraction worker(s)" in (

tests/unit_tests/test_platformio_registry.py

@@ -818,17 +818,14 @@ def test_install_packages_first_failure_reraised(
     assert "Could not install" in caplog.text
 
 
-def test_install_package_extract_progress_suppresses_bars(
-    tmp_path: Path, caplog: pytest.LogCaptureFixture
-) -> None:
-    """A batched install routes extraction fractions to the caller and keeps
-    both private bars and per-package INFO lines off the shared bar."""
+@contextmanager
+def _batched_install(tmp_path: Path, extract_progress, prefill_archive: bool = True):
+    """Run a batched install_package of pkg@1.0.0; yields the download mock."""
     dest = tmp_path / "pkg"
-    (tmp_path / "dl").mkdir()
-    (tmp_path / "dl" / "pkg-1.0.0").write_bytes(b"x")
-    fractions: list[float] = []
+    if prefill_archive:
+        (tmp_path / "dl").mkdir()
+        (tmp_path / "dl" / "pkg-1.0.0").write_bytes(b"x")
     with (
-        caplog.at_level(logging.INFO),
         patch.object(registry, "download_with_resume") as mock_download,
         patch.object(registry, "archive_extract_all") as mock_extract,
         patch.object(
@@ -847,8 +844,22 @@ def test_install_package_extract_progress_suppresses_bars(
             [],
             tmp_path / "dl",
             expect=("payload",),
-            extract_progress=fractions.append,
+            extract_progress=extract_progress,
         )
+        yield mock_download, mock_extract
+
+
+def test_install_package_extract_progress_suppresses_bars(
+    tmp_path: Path, caplog: pytest.LogCaptureFixture
+) -> None:
+    """A batched install routes extraction fractions to the caller and keeps
+    both private bars and per-package INFO lines off the shared bar."""
+    fractions: list[float] = []
+    with (
+        caplog.at_level(logging.INFO),
+        _batched_install(tmp_path, fractions.append) as (mock_download, mock_extract),
+    ):
+        pass
     assert mock_extract.call_args[1]["progress"] == fractions.append
     # The download tracker reports zero bytes, keeping the shared bar honest
     download_progress = mock_download.call_args[1]["progress"]
@@ -864,29 +875,11 @@ def test_install_package_batched_missing_archive_keeps_info_log(
 ) -> None:
     """A batched archive that unexpectedly needs a real download keeps the
     INFO line; the shared bar shows no progress for it."""
-    dest = tmp_path / "pkg"
     with (
         caplog.at_level(logging.INFO),
-        patch.object(registry, "download_with_resume"),
-        patch.object(registry, "archive_extract_all") as mock_extract,
-        patch.object(
-            registry,
-            "registry_download",
-            return_value=("http://x/pkg.tar.gz", "abc123", 42),
-        ),
+        _batched_install(tmp_path, lambda _frac: None, prefill_archive=False),
     ):
-        mock_extract.side_effect = lambda *_a, **_kw: (dest / "payload").mkdir(
-            parents=True
-        )
-        registry.install_package(
-            "pkg",
-            "1.0.0",
-            dest,
-            [],
-            tmp_path / "dl",
-            expect=("payload",),
-            extract_progress=lambda _frac: None,
-        )
+        pass
     assert "Downloading pkg 1.0.0" in caplog.text
 
 
@@ -934,31 +927,10 @@ def test_install_package_batched_refetch_announced_once(
 ) -> None:
     """A batched archive that fails verification and refetches is announced;
     a verify no-op (full size credited immediately) stays silent."""
-    dest = tmp_path / "pkg"
-    (tmp_path / "dl").mkdir()
-    (tmp_path / "dl" / "pkg-1.0.0").write_bytes(b"x")
     with (
         caplog.at_level(logging.INFO),
-        patch.object(registry, "download_with_resume") as mock_download,
-        patch.object(registry, "archive_extract_all") as mock_extract,
-        patch.object(
-            registry,
-            "registry_download",
-            return_value=("http://x/pkg.tar.gz", "abc123", 42),
-        ),
+        _batched_install(tmp_path, lambda _frac: None) as (mock_download, _),
     ):
-        mock_extract.side_effect = lambda *_a, **_kw: (dest / "payload").mkdir(
-            parents=True
-        )
-        registry.install_package(
-            "pkg",
-            "1.0.0",
-            dest,
-            [],
-            tmp_path / "dl",
-            expect=("payload",),
-            extract_progress=lambda _frac: None,
-        )
         progress = mock_download.call_args[1]["progress"]
         progress(42)
         assert "Re-downloading pkg 1.0.0" not in caplog.text