jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 21:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

DNS IP implement retry (#105675)

Browse Source 
* DNS IP implement retry

* Review comments
This commit is contained in:
G Johansson 2023-12-30 10:51:34 +01:00 committed by GitHub
parent f22d6a4279
commit bcf75795c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/components/dnsip/sensor.py
View File

@ -23,6 +23,8 @@ from .const import (
DOMAIN, DOMAIN,
) )
DEFAULT_RETRIES = 2
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
SCAN_INTERVAL = timedelta(seconds=120) SCAN_INTERVAL = timedelta(seconds=120)
@ -67,6 +69,7 @@ class WanIpSensor(SensorEntity):
self.resolver = aiodns.DNSResolver() self.resolver = aiodns.DNSResolver()
self.resolver.nameservers = [resolver] self.resolver.nameservers = [resolver]
self.querytype = "AAAA" if ipv6 else "A" self.querytype = "AAAA" if ipv6 else "A"
self._retries = DEFAULT_RETRIES
self._attr_extra_state_attributes = { self._attr_extra_state_attributes = {
"Resolver": resolver, "Resolver": resolver,
"Querytype": self.querytype, "Querytype": self.querytype,
@ -90,5 +93,8 @@ class WanIpSensor(SensorEntity):
if response: if response:
self._attr_native_value = response[0].host self._attr_native_value = response[0].host
self._attr_available = True self._attr_available = True
self._retries = DEFAULT_RETRIES
elif self._retries > 0:
self._retries -= 1
else: else:
self._attr_available = False self._attr_available = False

23
tests/components/dnsip/test_sensor.py
View File

@ -5,6 +5,7 @@ from datetime import timedelta
from unittest.mock import patch from unittest.mock import patch
from aiodns.error import DNSError from aiodns.error import DNSError
from freezegun.api import FrozenDateTimeFactory
from homeassistant.components.dnsip.const import ( from homeassistant.components.dnsip.const import (
CONF_HOSTNAME, CONF_HOSTNAME,
@ -14,10 +15,10 @@ from homeassistant.components.dnsip.const import (
CONF_RESOLVER_IPV6, CONF_RESOLVER_IPV6,
DOMAIN, DOMAIN,
) )
from homeassistant.components.dnsip.sensor import SCAN_INTERVAL
from homeassistant.config_entries import SOURCE_USER from homeassistant.config_entries import SOURCE_USER
from homeassistant.const import CONF_NAME, STATE_UNAVAILABLE from homeassistant.const import CONF_NAME, STATE_UNAVAILABLE
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.util import dt as dt_util
from . import RetrieveDNS from . import RetrieveDNS
@ -58,7 +59,9 @@ async def test_sensor(hass: HomeAssistant) -> None:
assert state2.state == "1.2.3.4" assert state2.state == "1.2.3.4"
async def test_sensor_no_response(hass: HomeAssistant) -> None: async def test_sensor_no_response(
hass: HomeAssistant, freezer: FrozenDateTimeFactory
) -> None:
"""Test the DNS IP sensor with DNS error.""" """Test the DNS IP sensor with DNS error."""
entry = MockConfigEntry( entry = MockConfigEntry(
domain=DOMAIN, domain=DOMAIN,
@ -95,10 +98,18 @@ async def test_sensor_no_response(hass: HomeAssistant) -> None:
"homeassistant.components.dnsip.sensor.aiodns.DNSResolver", "homeassistant.components.dnsip.sensor.aiodns.DNSResolver",
return_value=dns_mock, return_value=dns_mock,
): ):
async_fire_time_changed( freezer.tick(timedelta(seconds=SCAN_INTERVAL.seconds))
hass, async_fire_time_changed(hass)
dt_util.utcnow() + timedelta(minutes=10), freezer.tick(timedelta(seconds=SCAN_INTERVAL.seconds))
) async_fire_time_changed(hass)
await hass.async_block_till_done()
# Allows 2 retries before going unavailable
state = hass.states.get("sensor.home_assistant_io")
assert state.state == "1.2.3.4"
freezer.tick(timedelta(seconds=SCAN_INTERVAL.seconds))
async_fire_time_changed(hass)
await hass.async_block_till_done() await hass.async_block_till_done()
state = hass.states.get("sensor.home_assistant_io") state = hass.states.get("sensor.home_assistant_io")