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

tests/unit_tests/test_espidf_framework.py

@@ -984,9 +984,13 @@ def test_prefetch_downloads_each_archive_with_resume(tmp_path: Path) -> None:
     kwargs = calls[("https://example.com/cmake.tar.gz", dist / "cmake-3.30.2.tar.gz")]
     assert kwargs["sha256"] == "ab" * 32
     assert kwargs["size"] == 123
-    # every archive reports into the one combined progress bar
+    # every archive reports into the one combined progress bar via the
+    # cancellation-checked wrapper; verify it delegates to the tracker
     progress_cls.assert_called_once_with("Downloading ESP-IDF tools", 123 + 45)
-    assert all(kw["progress"] is tracker for kw in calls.values())
+    before = tracker.call_count
+    for kw in calls.values():
+        kw["progress"](7)
+    assert tracker.call_count == before + len(calls)
 
 
 def test_prefetch_downloads_archives_concurrently(tmp_path: Path) -> None:

tests/unit_tests/test_framework_helpers.py

@@ -1158,6 +1158,40 @@ class TestDownloadWithResume:
         assert seen == [8]
 
 
+def test_run_batch_downloads_ctrl_c_aborts_in_flight_jobs() -> None:
+    """Ctrl-C cancels in-flight downloads at their next tick instead of
+    letting non-daemon workers download to completion."""
+    import threading
+    import time
+
+    from esphome.framework_helpers import BatchDownloadProgress, run_batch_downloads
+
+    started = threading.Event()
+    ticks: list[int] = []
+
+    def interrupter(tracker) -> None:
+        started.wait(5)
+        raise KeyboardInterrupt
+
+    def slow_download(tracker) -> None:
+        started.set()
+        for i in range(500):
+            tracker(i)
+            ticks.append(i)
+            time.sleep(0.01)
+
+    t0 = time.monotonic()
+    with pytest.raises(KeyboardInterrupt):
+        run_batch_downloads(
+            BatchDownloadProgress("Downloading", 0),
+            [("boom", interrupter), ("slow", slow_download)],
+            max_workers=2,
+        )
+    # Uncancelled, slow_download alone takes ~5s
+    assert time.monotonic() - t0 < 3
+    assert len(ticks) < 500
+
+
 class TestBatchDownloadProgress:
     def test_sums_trackers_into_one_bar(self) -> None:
         with patch("esphome.framework_helpers.ProgressBar") as bar_cls:

tests/unit_tests/test_platformio_library.py

@@ -280,6 +280,8 @@ def test_wave_requirement_growth_defers_the_superseded_download(tmp_path, monkey
         (self.path / "library.json").write_text(json.dumps(manifests[self.name]))
 
     monkeypatch.setattr(ConvertedLibrary, "download", fake_download)
+    # Hermetic: unknown sizes take the sequential path instead of real HEADs
+    monkeypatch.setattr(lib, "_content_lengths", lambda urls: [None] * len(urls))
     _patch_registry_resolve(monkeypatch)
     top = convert_libraries(
         [Library("esphome/A", "1.0.0", None), Library("esphome/B", None, None)],
@@ -744,9 +746,7 @@ def test_content_lengths_head_requests(monkeypatch: pytest.MonkeyPatch) -> None:
             return SimpleNamespace(ok=True, headers={"content-length": "123, 123"})
         return SimpleNamespace(ok=True, headers={"content-length": "123"})
 
-    monkeypatch.setattr(
-        lib.requests if hasattr(lib, "requests") else requests, "head", fake_head
-    )
+    monkeypatch.setattr(requests, "head", fake_head)
     # None marks an unknown size (probe failure or non-2xx), distinct
     # from a genuine zero
     assert lib._content_lengths(