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

Revert "Deprecate last_reset options in MQTT sensor" (#55457)

Browse source 
This reverts commit f9fa5fa804.
This commit is contained in:
Erik Montnemery 2021-08-30 16:58:48 +02:00 • committed by GitHub
parent a668300c2e
commit ed53bb1d91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

9
homeassistant/components/mqtt/sensor.py
View file

@ -53,11 +53,7 @@ MQTT_SENSOR_ATTRIBUTES_BLOCKED = frozenset(
DEFAULT_NAME = "MQTT Sensor"
DEFAULT_FORCE_UPDATE = False
PLATFORM_SCHEMA = vol.All(
# Deprecated, remove in Home Assistant 2021.11
cv.deprecated(CONF_LAST_RESET_TOPIC),
cv.deprecated(CONF_LAST_RESET_VALUE_TEMPLATE),
mqtt.MQTT_RO_PLATFORM_SCHEMA.extend(
PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend(
{
vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
vol.Optional(CONF_EXPIRE_AFTER): cv.positive_int,
@ -68,8 +64,7 @@ PLATFORM_SCHEMA = vol.All(
vol.Optional(CONF_STATE_CLASS): STATE_CLASSES_SCHEMA,
vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string,
}
).extend(MQTT_ENTITY_COMMON_SCHEMA.schema),
)
).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
async def async_setup_platform(

22
tests/components/mqtt/test_sensor.py
View file

@ -306,28 +306,6 @@ async def test_setting_sensor_last_reset_via_mqtt_json_message(hass, mqtt_mock):
assert state.attributes.get("last_reset") == "2020-01-02T08:11:00"
async def test_last_reset_deprecated(hass, mqtt_mock, caplog):
"""Test the setting of the last_reset property via MQTT."""
assert await async_setup_component(
hass,
sensor.DOMAIN,
{
sensor.DOMAIN: {
"platform": "mqtt",
"name": "test",
"state_topic": "test-topic",
"unit_of_measurement": "fav unit",
"last_reset_topic": "last-reset-topic",
"last_reset_value_template": "{{ value_json.last_reset }}",
}
},
)
await hass.async_block_till_done()
assert "The 'last_reset_topic' option is deprecated" in caplog.text
assert "The 'last_reset_value_template' option is deprecated" in caplog.text
async def test_force_update_disabled(hass, mqtt_mock):
"""Test force update option."""
assert await async_setup_component(