evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflict with master to dev in sabnzbd (CI fix) (#71605)

Browse source
This commit is contained in:
J. Nick Koston 2022-05-09 12:58:42 -05:00 • committed by GitHub
parent d8e4f6d6e6
commit 37c4318d33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/components/sabnzbd/test_init.py
View file

@ -3,7 +3,7 @@ from unittest.mock import patch
import pytest
from homeassistant.components.sabnzbd import DEFAULT_NAME, DOMAIN, SENSOR_KEYS
from homeassistant.components.sabnzbd import DEFAULT_NAME, DOMAIN, OLD_SENSOR_KEYS
from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
from homeassistant.const import CONF_API_KEY, CONF_NAME, CONF_URL
from homeassistant.helpers.device_registry import DeviceEntryType
@ -54,7 +54,7 @@ async def test_unique_id_migrate(hass, device_registry, entity_registry):
entity_id_sensor_key = []
for sensor_key in SENSOR_KEYS:
for sensor_key in OLD_SENSOR_KEYS:
mock_entity_id = f"{SENSOR_DOMAIN}.{DOMAIN}_{sensor_key}"
entity_registry.async_get_or_create(
SENSOR_DOMAIN,