github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-04 18:11:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address review: drop redundant comments and rely on existing CORE.reset() between tests

Browse Source
This commit is contained in:
J. Nick Koston
2026-04-26 04:49:04 -05:00
parent 5150a32224
commit 3438ff817a
7 changed files with 16 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/component_tests/external_components/test_init.py
-11
View File
@@ -4,8 +4,6 @@ from pathlib import Path
from typing import Any
from unittest.mock import MagicMock
import pytest
from esphome.components.external_components import do_external_components_pass
from esphome.const import (
CONF_EXTERNAL_COMPONENTS,
@@ -38,18 +36,10 @@ def _make_config(tmp_path: Path) -> dict[str, Any]:
}
@pytest.fixture
def reset_skip_external_update() -> None:
"""Ensure CORE.skip_external_update is restored between tests."""
yield
CORE.skip_external_update = False
def test_external_components_skip_update_via_core_flag(
tmp_path: Path,
mock_clone_or_update: MagicMock,
mock_install_meta_finder: MagicMock,
reset_skip_external_update: None,
) -> None:
"""When CORE.skip_external_update is True, refresh is still passed through;
git.clone_or_update itself short-circuits the actual fetch."""
@@ -69,7 +59,6 @@ def test_external_components_normal_refresh(
tmp_path: Path,
mock_clone_or_update: MagicMock,
mock_install_meta_finder: MagicMock,
reset_skip_external_update: None,
) -> None:
"""When CORE.skip_external_update is False, the configured refresh value is used."""
mock_clone_or_update.return_value = (tmp_path, None)
tests/component_tests/packages/test_init.py
-11
View File
@@ -4,8 +4,6 @@ from pathlib import Path
from typing import Any
from unittest.mock import MagicMock
import pytest
from esphome.components.packages import do_packages_pass
from esphome.const import CONF_FILES, CONF_PACKAGES, CONF_REFRESH, CONF_URL
from esphome.core import CORE, TimePeriodSeconds
@@ -24,18 +22,10 @@ def _make_config() -> dict[str, Any]:
}
@pytest.fixture
def reset_skip_external_update() -> None:
"""Ensure CORE.skip_external_update is restored between tests."""
yield
CORE.skip_external_update = False
def test_packages_skip_update_via_core_flag(
tmp_path: Path,
mock_clone_or_update: MagicMock,
mock_load_yaml: MagicMock,
reset_skip_external_update: None,
) -> None:
"""When CORE.skip_external_update is True, refresh is still passed through;
git.clone_or_update itself short-circuits the actual fetch."""
@@ -60,7 +50,6 @@ def test_packages_normal_refresh(
tmp_path: Path,
mock_clone_or_update: MagicMock,
mock_load_yaml: MagicMock,
reset_skip_external_update: None,
) -> None:
"""When CORE.skip_external_update is False, the configured refresh value is used."""
mock_clone_or_update.return_value = (tmp_path, None)