[store_yaml] Simplify: packages records remote sources, single tree walker, dict-style test packages

tests/components/store_yaml/test.bk72xx-ard.yaml

@@ -2,4 +2,5 @@ wifi:
   ssid: MySSID
   password: password1
 
-<<: !include common.yaml
+packages:
+  store_yaml: !include common.yaml

tests/components/store_yaml/test.esp32-idf.yaml

@@ -2,4 +2,5 @@ wifi:
   ssid: MySSID
   password: password1
 
-<<: !include common.yaml
+packages:
+  store_yaml: !include common.yaml

tests/components/store_yaml/test.esp8266-ard.yaml

@@ -2,4 +2,5 @@ wifi:
   ssid: MySSID
   password: password1
 
-<<: !include common.yaml
+packages:
+  store_yaml: !include common.yaml

tests/components/store_yaml/test.host.yaml

@@ -1,3 +1,4 @@
-<<: !include common.yaml
-
 network:
+
+packages:
+  store_yaml: !include common.yaml

tests/components/store_yaml/test.ln882x-ard.yaml

@@ -2,4 +2,5 @@ wifi:
   ssid: MySSID
   password: password1
 
-<<: !include common.yaml
+packages:
+  store_yaml: !include common.yaml

tests/components/store_yaml/test.rp2040-ard.yaml

@@ -2,4 +2,5 @@ wifi:
   ssid: MySSID
   password: password1
 
-<<: !include common.yaml
+packages:
+  store_yaml: !include common.yaml

tests/components/store_yaml/test.rtl87xx-ard.yaml

@@ -2,4 +2,5 @@ wifi:
   ssid: MySSID
   password: password1
 
-<<: !include common.yaml
+packages:
+  store_yaml: !include common.yaml

tests/integration/conftest.py

@@ -10,6 +10,7 @@ import logging
 import os
 from pathlib import Path
 import platform
+import re
 import signal
 import socket
 import subprocess
@@ -178,10 +179,9 @@ async def yaml_config(request: pytest.FixtureRequest, unused_tcp_port: int) -> s
     loop = asyncio.get_running_loop()
     content = await loop.run_in_executor(None, fixture_path.read_text)
 
-    # Replace the port in the config if it contains api section
-    if "api:" in content:
-        # Add port configuration after api:
-        content = content.replace("api:", f"api:\n  port: {unused_tcp_port}")
+    # Replace the port in the config if it contains an api section. Anchored to
+    # the start of a line so keys that merely end in "api:" are left alone.
+    content = re.sub(r"(?m)^api:", f"api:\n  port: {unused_tcp_port}", content)
 
     # Add debug build flags for integration tests to enable assertions
     if "esphome:" in content and "platformio_options:" not in content:

tests/integration/test_store_yaml_recovery.py

@@ -19,12 +19,8 @@ import contextlib
 
 import pytest
 
-try:
-    from compression import zstd  # type: ignore[import-not-found]
-except ImportError:
-    from backports import zstd  # type: ignore[import-not-found, no-redef]
-
-from esphome.components.store_yaml import unpack_envelope
+# The component resolves the stdlib-vs-backport zstd import once; reuse it.
+from esphome.components.store_yaml import unpack_envelope, zstd
 from esphome.yaml_util import find_secret_references
 
 from .types import RunCompiledFunction

tests/unit_tests/components/test_store_yaml.py

@@ -8,16 +8,17 @@ from pathlib import Path
 import pytest
 
 from esphome import yaml_util
+from esphome.components import packages
 from esphome.components.store_yaml import (
     CONF_ALLOW_UNENCRYPTED,
     SECRETS_SKELETON_HEADER,
     UNCAPTURED_NOTE_PATH,
     _final_validate,
-    _find_remote_packages,
     _gather_files,
     _generate_redacted_files,
     _pack_envelope,
     _read_files_verbatim,
+    _remote_package_descriptions,
     _uncaptured_note,
     unpack_envelope,
 )
@@ -290,40 +291,36 @@ def test_uncaptured_note_lists_remote_packages() -> None:
     """Remote packages that can't be captured are recorded with their source
     so the user knows to re-fetch them."""
     rel, content = _uncaptured_note(
-        [], ["base: https://github.com/org/repo@main", "github://org/repo/file.yaml"]
+        [], ["https://github.com/org/repo@main", "https://github.com/org/other"]
     )
     assert rel == UNCAPTURED_NOTE_PATH
     text = content.decode()
-    assert "#   base: https://github.com/org/repo@main" in text
-    assert "#   github://org/repo/file.yaml" in text
+    assert "#   https://github.com/org/repo@main" in text
+    assert "#   https://github.com/org/other" in text
 
 
-def test_find_remote_packages_detects_url_and_shorthand(project: Path) -> None:
-    """`packages:` entries with a url (dict or shorthand string) are reported;
-    local `!include` packages are not."""
-    (project / "entry.yaml").write_text(
-        "packages:\n"
-        "  base:\n"
-        "    url: https://github.com/org/repo\n"
-        "    ref: main\n"
-        "    files: [common.yaml]\n"
-        "  shorthand: github://org/repo/file.yaml@main\n"
-        "  local: !include wifi.yaml\n"
-        "esphome:\n  name: test\n"
+def test_remote_package_descriptions_read_packages_record(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Remote sources recorded by the packages component during config
+    processing are formatted as url@ref (url alone when ref is absent)."""
+    monkeypatch.delitem(CORE.data, packages.DOMAIN, raising=False)
+    data = packages._get_data()
+    data.remote_sources.append(
+        packages.RemotePackageSource("https://github.com/org/repo", "main")
     )
-    discovered = _sources(project, "entry.yaml", "wifi.yaml")
-    entries, _ = _gather_files(discovered)
-    remote = _find_remote_packages(entries)
-    assert remote == [
-        "base: https://github.com/org/repo@main",
-        "shorthand: github://org/repo/file.yaml@main",
+    data.remote_sources.append(
+        packages.RemotePackageSource("https://github.com/org/other", None)
+    )
+    assert _remote_package_descriptions() == [
+        "https://github.com/org/repo@main",
+        "https://github.com/org/other",
     ]
 
 
-def test_find_remote_packages_ignores_local_only(project: Path) -> None:
-    discovered = _sources(project, "entry.yaml", "wifi.yaml")
-    entries, _ = _gather_files(discovered)
-    assert _find_remote_packages(entries) == []
+def test_remote_package_descriptions_empty_without_packages() -> None:
+    CORE.data.pop(packages.DOMAIN, None)
+    assert _remote_package_descriptions() == []
 
 
 def test_redacted_skips_empty_sensitive_values(project: Path) -> None: