jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-26 22:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix flaky upnp test (#64617)

Browse Source 
* Attempt to fix flaky upnp test

* Remove unused constant

* Correct test changes

* Correct test changes
This commit is contained in:
Erik Montnemery 2022-01-21 17:27:07 +01:00 committed by GitHub
parent 9e2a8a5b09
commit 07e10c645b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
homeassistant/components/upnp/const.py
View File

@ -20,7 +20,6 @@ WAN_STATUS = "wan_status"
ROUTER_IP = "ip" ROUTER_IP = "ip"
ROUTER_UPTIME = "uptime" ROUTER_UPTIME = "uptime"
KIBIBYTE = 1024 KIBIBYTE = 1024
UPDATE_INTERVAL = timedelta(seconds=30)
CONFIG_ENTRY_SCAN_INTERVAL = "scan_interval" CONFIG_ENTRY_SCAN_INTERVAL = "scan_interval"
CONFIG_ENTRY_ST = "st" CONFIG_ENTRY_ST = "st"
CONFIG_ENTRY_UDN = "udn" CONFIG_ENTRY_UDN = "udn"

21
tests/components/upnp/test_sensor.py
View File

@ -1,18 +1,18 @@
"""Tests for UPnP/IGD sensor.""" """Tests for UPnP/IGD sensor."""
from datetime import timedelta
from unittest.mock import patch from unittest.mock import patch
from homeassistant.components.upnp import UpnpDataUpdateCoordinator from homeassistant.components.upnp import UpnpDataUpdateCoordinator
from homeassistant.components.upnp.const import ( from homeassistant.components.upnp.const import (
BYTES_RECEIVED, BYTES_RECEIVED,
BYTES_SENT, BYTES_SENT,
DEFAULT_SCAN_INTERVAL,
DOMAIN, DOMAIN,
PACKETS_RECEIVED, PACKETS_RECEIVED,
PACKETS_SENT, PACKETS_SENT,
ROUTER_IP, ROUTER_IP,
ROUTER_UPTIME, ROUTER_UPTIME,
TIMESTAMP,
UPDATE_INTERVAL,
WAN_STATUS, WAN_STATUS,
) )
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
@ -54,7 +54,8 @@ async def test_upnp_sensors(hass: HomeAssistant, setup_integration: MockConfigEn
ROUTER_UPTIME: 100, ROUTER_UPTIME: 100,
ROUTER_IP: "", ROUTER_IP: "",
} }
async_fire_time_changed(hass, dt_util.utcnow() + UPDATE_INTERVAL) now = dt_util.utcnow()
async_fire_time_changed(hass, now + timedelta(seconds=DEFAULT_SCAN_INTERVAL))
await hass.async_block_till_done() await hass.async_block_till_done()
b_received_state = hass.states.get("sensor.mock_name_b_received") b_received_state = hass.states.get("sensor.mock_name_b_received")
@ -90,19 +91,19 @@ async def test_derived_upnp_sensors(
assert packets_s_sent_state.state == "unknown" assert packets_s_sent_state.state == "unknown"
# Second poll. # Second poll.
now = coordinator.data[TIMESTAMP] now = dt_util.utcnow()
with patch( with patch(
"homeassistant.components.upnp.device.utcnow", "homeassistant.components.upnp.device.utcnow",
return_value=now + UPDATE_INTERVAL, return_value=now + timedelta(seconds=DEFAULT_SCAN_INTERVAL),
): ):
mock_device: MockIgdDevice = coordinator.device._igd_device mock_device: MockIgdDevice = coordinator.device._igd_device
mock_device.traffic_data = { mock_device.traffic_data = {
BYTES_RECEIVED: int(10240 * UPDATE_INTERVAL.total_seconds()), BYTES_RECEIVED: int(10240 * DEFAULT_SCAN_INTERVAL),
BYTES_SENT: int(20480 * UPDATE_INTERVAL.total_seconds()), BYTES_SENT: int(20480 * DEFAULT_SCAN_INTERVAL),
PACKETS_RECEIVED: int(30 * UPDATE_INTERVAL.total_seconds()), PACKETS_RECEIVED: int(30 * DEFAULT_SCAN_INTERVAL),
PACKETS_SENT: int(40 * UPDATE_INTERVAL.total_seconds()), PACKETS_SENT: int(40 * DEFAULT_SCAN_INTERVAL),
} }
async_fire_time_changed(hass, now + UPDATE_INTERVAL) async_fire_time_changed(hass, now + timedelta(seconds=DEFAULT_SCAN_INTERVAL))
await hass.async_block_till_done() await hass.async_block_till_done()
kib_s_received_state = hass.states.get("sensor.mock_name_kib_s_received") kib_s_received_state = hass.states.get("sensor.mock_name_kib_s_received")