mirror of
https://github.com/esphome/esphome.git
synced 2025-09-16 18:22:22 +01:00
fixes
This commit is contained in:
@@ -8,6 +8,7 @@ from hypothesis.strategies import ip_addresses
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from esphome import helpers
|
from esphome import helpers
|
||||||
|
from esphome.address_cache import AddressCache
|
||||||
from esphome.core import EsphomeError
|
from esphome.core import EsphomeError
|
||||||
|
|
||||||
|
|
||||||
@@ -598,8 +599,6 @@ def test_resolve_ip_address_sorting() -> None:
|
|||||||
|
|
||||||
def test_resolve_ip_address_with_cache() -> None:
|
def test_resolve_ip_address_with_cache() -> None:
|
||||||
"""Test that the cache is used when provided."""
|
"""Test that the cache is used when provided."""
|
||||||
from esphome.address_cache import AddressCache
|
|
||||||
|
|
||||||
cache = AddressCache(
|
cache = AddressCache(
|
||||||
mdns_cache={"test.local": ["192.168.1.100", "192.168.1.101"]},
|
mdns_cache={"test.local": ["192.168.1.100", "192.168.1.101"]},
|
||||||
dns_cache={
|
dns_cache={
|
||||||
@@ -626,8 +625,6 @@ def test_resolve_ip_address_with_cache() -> None:
|
|||||||
|
|
||||||
def test_resolve_ip_address_cache_miss() -> None:
|
def test_resolve_ip_address_cache_miss() -> None:
|
||||||
"""Test that resolver is called when not in cache."""
|
"""Test that resolver is called when not in cache."""
|
||||||
from esphome.address_cache import AddressCache
|
|
||||||
|
|
||||||
cache = AddressCache(mdns_cache={"other.local": ["192.168.1.200"]})
|
cache = AddressCache(mdns_cache={"other.local": ["192.168.1.200"]})
|
||||||
|
|
||||||
mock_addr_info = AddrInfo(
|
mock_addr_info = AddrInfo(
|
||||||
@@ -651,8 +648,6 @@ def test_resolve_ip_address_cache_miss() -> None:
|
|||||||
|
|
||||||
def test_resolve_ip_address_mixed_cached_uncached() -> None:
|
def test_resolve_ip_address_mixed_cached_uncached() -> None:
|
||||||
"""Test resolution with mix of cached and uncached hosts."""
|
"""Test resolution with mix of cached and uncached hosts."""
|
||||||
from esphome.address_cache import AddressCache
|
|
||||||
|
|
||||||
cache = AddressCache(mdns_cache={"cached.local": ["192.168.1.50"]})
|
cache = AddressCache(mdns_cache={"cached.local": ["192.168.1.50"]})
|
||||||
|
|
||||||
mock_addr_info = AddrInfo(
|
mock_addr_info = AddrInfo(
|
||||||
|
@@ -10,7 +10,6 @@ from unittest.mock import Mock, patch
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from esphome.__main__ import choose_upload_log_host
|
from esphome.__main__ import choose_upload_log_host
|
||||||
from esphome.address_cache import AddressCache
|
|
||||||
from esphome.const import CONF_BROKER, CONF_MQTT, CONF_USE_ADDRESS, CONF_WIFI
|
from esphome.const import CONF_BROKER, CONF_MQTT, CONF_USE_ADDRESS, CONF_WIFI
|
||||||
from esphome.core import CORE
|
from esphome.core import CORE
|
||||||
|
|
||||||
@@ -511,73 +510,3 @@ def test_choose_upload_log_host_no_address_with_ota_config() -> None:
|
|||||||
show_api=False,
|
show_api=False,
|
||||||
)
|
)
|
||||||
assert result == []
|
assert result == []
|
||||||
|
|
||||||
|
|
||||||
def test_address_cache_from_cli_args() -> None:
|
|
||||||
"""Test parsing address cache from CLI arguments."""
|
|
||||||
# Test empty lists
|
|
||||||
cache = AddressCache.from_cli_args([], [])
|
|
||||||
assert cache.mdns_cache == {}
|
|
||||||
assert cache.dns_cache == {}
|
|
||||||
|
|
||||||
# Test single entry with single IP
|
|
||||||
cache = AddressCache.from_cli_args(
|
|
||||||
["host.local=192.168.1.1"], ["example.com=10.0.0.1"]
|
|
||||||
)
|
|
||||||
assert cache.mdns_cache == {"host.local": ["192.168.1.1"]}
|
|
||||||
assert cache.dns_cache == {"example.com": ["10.0.0.1"]}
|
|
||||||
|
|
||||||
# Test multiple IPs
|
|
||||||
cache = AddressCache.from_cli_args(["host.local=192.168.1.1,192.168.1.2"], [])
|
|
||||||
assert cache.mdns_cache == {"host.local": ["192.168.1.1", "192.168.1.2"]}
|
|
||||||
|
|
||||||
# Test multiple entries
|
|
||||||
cache = AddressCache.from_cli_args(
|
|
||||||
["host1.local=192.168.1.1", "host2.local=192.168.1.2"],
|
|
||||||
["example.com=10.0.0.1", "test.org=10.0.0.2,10.0.0.3"],
|
|
||||||
)
|
|
||||||
assert cache.mdns_cache == {
|
|
||||||
"host1.local": ["192.168.1.1"],
|
|
||||||
"host2.local": ["192.168.1.2"],
|
|
||||||
}
|
|
||||||
assert cache.dns_cache == {
|
|
||||||
"example.com": ["10.0.0.1"],
|
|
||||||
"test.org": ["10.0.0.2", "10.0.0.3"],
|
|
||||||
}
|
|
||||||
|
|
||||||
# Test with IPv6
|
|
||||||
cache = AddressCache.from_cli_args(["host.local=2001:db8::1,fe80::1"], [])
|
|
||||||
assert cache.mdns_cache == {"host.local": ["2001:db8::1", "fe80::1"]}
|
|
||||||
|
|
||||||
# Test invalid format (should be skipped with warning)
|
|
||||||
with patch("esphome.address_cache._LOGGER") as mock_logger:
|
|
||||||
cache = AddressCache.from_cli_args(["invalid_format"], [])
|
|
||||||
assert cache.mdns_cache == {}
|
|
||||||
mock_logger.warning.assert_called_once()
|
|
||||||
|
|
||||||
|
|
||||||
def test_address_cache_get_methods() -> None:
|
|
||||||
"""Test the AddressCache get methods."""
|
|
||||||
cache = AddressCache(
|
|
||||||
mdns_cache={"test.local": ["192.168.1.1"]},
|
|
||||||
dns_cache={"example.com": ["10.0.0.1"]},
|
|
||||||
)
|
|
||||||
|
|
||||||
# Test mDNS lookup
|
|
||||||
assert cache.get_mdns_addresses("test.local") == ["192.168.1.1"]
|
|
||||||
assert cache.get_mdns_addresses("other.local") is None
|
|
||||||
|
|
||||||
# Test DNS lookup
|
|
||||||
assert cache.get_dns_addresses("example.com") == ["10.0.0.1"]
|
|
||||||
assert cache.get_dns_addresses("other.com") is None
|
|
||||||
|
|
||||||
# Test automatic selection based on domain
|
|
||||||
assert cache.get_addresses("test.local") == ["192.168.1.1"]
|
|
||||||
assert cache.get_addresses("example.com") == ["10.0.0.1"]
|
|
||||||
assert cache.get_addresses("unknown.local") is None
|
|
||||||
assert cache.get_addresses("unknown.com") is None
|
|
||||||
|
|
||||||
# Test has_cache
|
|
||||||
assert cache.has_cache() is True
|
|
||||||
empty_cache = AddressCache()
|
|
||||||
assert empty_cache.has_cache() is False
|
|
||||||
|
Reference in New Issue
Block a user