Merge remote-tracking branch 'upstream/skip_external_files_update_logs' into integration

tests/unit_tests/test_external_files.py

@@ -236,3 +236,51 @@ def test_download_content_with_network_error_no_cache_fails(
 
     with pytest.raises(Invalid, match="Could not download from.*Network error"):
         external_files.download_content(url, test_file)
+
+
+@patch("esphome.external_files.requests.get")
+@patch("esphome.external_files.has_remote_file_changed")
+def test_download_content_skip_external_update_uses_cache(
+    mock_has_changed: MagicMock, mock_get: MagicMock, setup_core: Path
+) -> None:
+    """Test download_content skips network checks when CORE.skip_external_update is set."""
+    test_file = setup_core / "cached.txt"
+    cached_content = b"cached content"
+    test_file.write_bytes(cached_content)
+
+    CORE.skip_external_update = True
+    try:
+        url = "https://example.com/file.txt"
+        result = external_files.download_content(url, test_file)
+    finally:
+        CORE.skip_external_update = False
+
+    assert result == cached_content
+    mock_has_changed.assert_not_called()
+    mock_get.assert_not_called()
+
+
+@patch("esphome.external_files.requests.get")
+@patch("esphome.external_files.has_remote_file_changed")
+def test_download_content_skip_external_update_downloads_when_missing(
+    mock_has_changed: MagicMock, mock_get: MagicMock, setup_core: Path
+) -> None:
+    """Test download_content still downloads when file is missing, even with skip_external_update."""
+    test_file = setup_core / "missing.txt"
+    new_content = b"fresh content"
+
+    mock_has_changed.return_value = True
+    mock_response = MagicMock()
+    mock_response.content = new_content
+    mock_response.raise_for_status = MagicMock()
+    mock_get.return_value = mock_response
+
+    CORE.skip_external_update = True
+    try:
+        url = "https://example.com/file.txt"
+        result = external_files.download_content(url, test_file)
+    finally:
+        CORE.skip_external_update = False
+
+    assert result == new_content
+    assert test_file.read_bytes() == new_content

tests/unit_tests/test_git.py

@@ -236,6 +236,38 @@ def test_clone_or_update_with_never_refresh(
     assert revert is None
 
 
+def test_clone_or_update_skips_when_core_skip_external_update(
+    tmp_path: Path, mock_run_git_command: Mock
+) -> None:
+    """CORE.skip_external_update short-circuits the refresh for existing repos."""
+    CORE.config_path = tmp_path / "test.yaml"
+
+    url = "https://github.com/test/repo"
+    ref = None
+    domain = "test"
+    repo_dir = _compute_repo_dir(url, ref, domain)
+
+    repo_dir.mkdir(parents=True)
+    git_dir = repo_dir / ".git"
+    git_dir.mkdir()
+    (git_dir / "FETCH_HEAD").write_text("test")
+
+    CORE.skip_external_update = True
+    try:
+        result_dir, revert = git.clone_or_update(
+            url=url,
+            ref=ref,
+            refresh=TimePeriodSeconds(days=1),
+            domain=domain,
+        )
+    finally:
+        CORE.skip_external_update = False
+
+    mock_run_git_command.assert_not_called()
+    assert result_dir == repo_dir
+    assert revert is None
+
+
 def test_clone_or_update_with_refresh_updates_old_repo(
     tmp_path: Path, mock_run_git_command: Mock
 ) -> None:

tests/unit_tests/test_substitutions.py

@@ -654,7 +654,7 @@ def test_resolve_package_max_depth_exceeded(tmp_path: Path) -> None:
     package_config = yaml_util.IncludeFile(
         parent, "test.yaml", None, always_returns_include
     )
-    processor = _PackageProcessor({}, None, False)
+    processor = _PackageProcessor({}, None)
     with pytest.raises(
         cv.Invalid,
         match=f"Maximum include nesting depth \\({MAX_INCLUDE_DEPTH}\\) exceeded",
@@ -776,7 +776,7 @@ def test_resolve_package_undefined_var_in_include_filename(tmp_path: Path) -> No
     package_config = yaml_util.IncludeFile(
         parent, "${undefined_var}.yaml", None, loader
     )
-    processor = _PackageProcessor({}, None, False)
+    processor = _PackageProcessor({}, None)
     with pytest.raises(cv.Invalid, match="unresolved substitutions"):
         processor.resolve_package(package_config, substitutions.ContextVars(), [])