mirror of
https://github.com/home-assistant/core.git
synced 2025-07-10 14:57:09 +00:00
Diferentiate between attr_name and entity_id in Modbus tests (#66999)
This commit is contained in:
parent
137793c067
commit
8741ff0684
@ -126,7 +126,7 @@ class SlaveSensor(CoordinatorEntity, RestoreEntity, BinarySensorEntity):
|
||||
) -> None:
|
||||
"""Initialize the Modbus binary sensor."""
|
||||
idx += 1
|
||||
self._attr_name = f"{entry[CONF_NAME]}_{idx}"
|
||||
self._attr_name = f"{entry[CONF_NAME]} {idx}"
|
||||
self._attr_device_class = entry.get(CONF_DEVICE_CLASS)
|
||||
self._attr_available = False
|
||||
self._result_inx = int(idx / 8)
|
||||
|
@ -16,7 +16,7 @@ import homeassistant.util.dt as dt_util
|
||||
from tests.common import async_fire_time_changed, mock_restore_cache
|
||||
|
||||
TEST_MODBUS_NAME = "modbusTest"
|
||||
TEST_ENTITY_NAME = "test_entity"
|
||||
TEST_ENTITY_NAME = "test entity"
|
||||
TEST_MODBUS_HOST = "modbusHost"
|
||||
TEST_PORT_TCP = 5501
|
||||
TEST_PORT_SERIAL = "usb01"
|
||||
|
@ -25,7 +25,7 @@ from homeassistant.core import State
|
||||
|
||||
from .conftest import TEST_ENTITY_NAME, ReadResult, do_next_cycle
|
||||
|
||||
ENTITY_ID = f"{SENSOR_DOMAIN}.{TEST_ENTITY_NAME}"
|
||||
ENTITY_ID = f"{SENSOR_DOMAIN}.{TEST_ENTITY_NAME}".replace(" ", "_")
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
@ -244,8 +244,8 @@ async def test_config_slave_binary_sensor(hass, mock_modbus):
|
||||
"""Run config test for binary sensor."""
|
||||
assert SENSOR_DOMAIN in hass.config.components
|
||||
|
||||
for addon in ["", "_1", "_2", "_3"]:
|
||||
entity_id = f"{SENSOR_DOMAIN}.{TEST_ENTITY_NAME}{addon}"
|
||||
for addon in ["", " 1", " 2", " 3"]:
|
||||
entity_id = f"{SENSOR_DOMAIN}.{TEST_ENTITY_NAME}{addon}".replace(" ", "_")
|
||||
assert hass.states.get(entity_id) is not None
|
||||
|
||||
|
||||
@ -315,5 +315,5 @@ async def test_slave_binary_sensor(hass, expected, slaves, mock_do_cycle):
|
||||
assert hass.states.get(ENTITY_ID).state == expected
|
||||
|
||||
for i in range(8):
|
||||
entity_id = f"{SENSOR_DOMAIN}.{TEST_ENTITY_NAME}_{i+1}"
|
||||
entity_id = f"{SENSOR_DOMAIN}.{TEST_ENTITY_NAME}_{i+1}".replace(" ", "_")
|
||||
assert hass.states.get(entity_id).state == slaves[i]
|
||||
|
@ -22,7 +22,7 @@ from homeassistant.core import State
|
||||
|
||||
from .conftest import TEST_ENTITY_NAME, ReadResult
|
||||
|
||||
ENTITY_ID = f"{CLIMATE_DOMAIN}.{TEST_ENTITY_NAME}"
|
||||
ENTITY_ID = f"{CLIMATE_DOMAIN}.{TEST_ENTITY_NAME}".replace(" ", "_")
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
|
@ -32,8 +32,8 @@ from homeassistant.core import State
|
||||
|
||||
from .conftest import TEST_ENTITY_NAME, ReadResult, do_next_cycle
|
||||
|
||||
ENTITY_ID = f"{COVER_DOMAIN}.{TEST_ENTITY_NAME}"
|
||||
ENTITY_ID2 = f"{ENTITY_ID}2"
|
||||
ENTITY_ID = f"{COVER_DOMAIN}.{TEST_ENTITY_NAME}".replace(" ", "_")
|
||||
ENTITY_ID2 = f"{ENTITY_ID}_2"
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
|
@ -32,8 +32,8 @@ from homeassistant.core import State
|
||||
|
||||
from .conftest import TEST_ENTITY_NAME, ReadResult
|
||||
|
||||
ENTITY_ID = f"{FAN_DOMAIN}.{TEST_ENTITY_NAME}"
|
||||
ENTITY_ID2 = f"{ENTITY_ID}2"
|
||||
ENTITY_ID = f"{FAN_DOMAIN}.{TEST_ENTITY_NAME}".replace(" ", "_")
|
||||
ENTITY_ID2 = f"{ENTITY_ID}_2"
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
|
@ -599,7 +599,7 @@ async def test_pb_read(
|
||||
"""Run test for different read."""
|
||||
|
||||
# Check state
|
||||
entity_id = f"{do_domain}.{TEST_ENTITY_NAME}"
|
||||
entity_id = f"{do_domain}.{TEST_ENTITY_NAME}".replace(" ", "_")
|
||||
state = hass.states.get(entity_id).state
|
||||
assert hass.states.get(entity_id).state
|
||||
|
||||
@ -681,7 +681,7 @@ async def test_delay(hass, mock_pymodbus):
|
||||
# We "hijiack" a binary_sensor to make a proper blackbox test.
|
||||
set_delay = 15
|
||||
set_scan_interval = 5
|
||||
entity_id = f"{BINARY_SENSOR_DOMAIN}.{TEST_ENTITY_NAME}"
|
||||
entity_id = f"{BINARY_SENSOR_DOMAIN}.{TEST_ENTITY_NAME}".replace(" ", "_")
|
||||
config = {
|
||||
DOMAIN: [
|
||||
{
|
||||
@ -778,7 +778,7 @@ async def test_stop_restart(hass, caplog, mock_modbus):
|
||||
"""Run test for service stop."""
|
||||
|
||||
caplog.set_level(logging.INFO)
|
||||
entity_id = f"{SENSOR_DOMAIN}.{TEST_ENTITY_NAME}"
|
||||
entity_id = f"{SENSOR_DOMAIN}.{TEST_ENTITY_NAME}".replace(" ", "_")
|
||||
assert hass.states.get(entity_id).state == STATE_UNKNOWN
|
||||
hass.states.async_set(entity_id, 17)
|
||||
await hass.async_block_till_done()
|
||||
|
@ -32,8 +32,8 @@ from homeassistant.core import State
|
||||
|
||||
from .conftest import TEST_ENTITY_NAME, ReadResult
|
||||
|
||||
ENTITY_ID = f"{LIGHT_DOMAIN}.{TEST_ENTITY_NAME}"
|
||||
ENTITY_ID2 = f"{ENTITY_ID}2"
|
||||
ENTITY_ID = f"{LIGHT_DOMAIN}.{TEST_ENTITY_NAME}".replace(" ", "_")
|
||||
ENTITY_ID2 = f"{ENTITY_ID}_2"
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
|
@ -37,7 +37,7 @@ from homeassistant.core import State
|
||||
|
||||
from .conftest import TEST_ENTITY_NAME, ReadResult, do_next_cycle
|
||||
|
||||
ENTITY_ID = f"{SENSOR_DOMAIN}.{TEST_ENTITY_NAME}"
|
||||
ENTITY_ID = f"{SENSOR_DOMAIN}.{TEST_ENTITY_NAME}".replace(" ", "_")
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
|
@ -40,8 +40,8 @@ from .conftest import TEST_ENTITY_NAME, ReadResult, do_next_cycle
|
||||
|
||||
from tests.common import async_fire_time_changed
|
||||
|
||||
ENTITY_ID = f"{SWITCH_DOMAIN}.{TEST_ENTITY_NAME}"
|
||||
ENTITY_ID2 = f"{ENTITY_ID}2"
|
||||
ENTITY_ID = f"{SWITCH_DOMAIN}.{TEST_ENTITY_NAME}".replace(" ", "_")
|
||||
ENTITY_ID2 = f"{ENTITY_ID}_2"
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
|
Loading…
x
Reference in New Issue
Block a user