Handle empty string BatReplacementDescription from Matter attribute value (#134457)

This commit is contained in:
Ludovic BOUÉ 2025-01-22 12:28:18 +01:00 committed by GitHub
parent f4d6cb45e5
commit 1ea6cba1f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 230 deletions

View File

@ -244,6 +244,8 @@ DISCOVERY_SCHEMAS = [
required_attributes=(
clusters.PowerSource.Attributes.BatReplacementDescription,
),
# Some manufacturers returns an empty string
value_is_not="",
),
MatterDiscoverySchema(
platform=Platform.SENSOR,

View File

@ -1145,98 +1145,6 @@
'state': '189.0',
})
# ---
# name: test_sensors[door_lock][sensor.mock_door_lock_battery_type-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': None,
'config_entry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
'entity_id': 'sensor.mock_door_lock_battery_type',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'options': dict({
}),
'original_device_class': None,
'original_icon': None,
'original_name': 'Battery type',
'platform': 'matter',
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'battery_replacement_description',
'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-PowerSourceBatReplacementDescription-47-19',
'unit_of_measurement': None,
})
# ---
# name: test_sensors[door_lock][sensor.mock_door_lock_battery_type-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Mock Door Lock Battery type',
}),
'context': <ANY>,
'entity_id': 'sensor.mock_door_lock_battery_type',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '',
})
# ---
# name: test_sensors[door_lock_with_unbolt][sensor.mock_door_lock_battery_type-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': None,
'config_entry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
'entity_id': 'sensor.mock_door_lock_battery_type',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'options': dict({
}),
'original_device_class': None,
'original_icon': None,
'original_name': 'Battery type',
'platform': 'matter',
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'battery_replacement_description',
'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-PowerSourceBatReplacementDescription-47-19',
'unit_of_measurement': None,
})
# ---
# name: test_sensors[door_lock_with_unbolt][sensor.mock_door_lock_battery_type-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Mock Door Lock Battery type',
}),
'context': <ANY>,
'entity_id': 'sensor.mock_door_lock_battery_type',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '',
})
# ---
# name: test_sensors[eve_contact_sensor][sensor.eve_door_battery-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
@ -1288,52 +1196,6 @@
'state': '100',
})
# ---
# name: test_sensors[eve_contact_sensor][sensor.eve_door_battery_type-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': None,
'config_entry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
'entity_id': 'sensor.eve_door_battery_type',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'options': dict({
}),
'original_device_class': None,
'original_icon': None,
'original_name': 'Battery type',
'platform': 'matter',
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'battery_replacement_description',
'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-PowerSourceBatReplacementDescription-47-19',
'unit_of_measurement': None,
})
# ---
# name: test_sensors[eve_contact_sensor][sensor.eve_door_battery_type-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Eve Door Battery type',
}),
'context': <ANY>,
'entity_id': 'sensor.eve_door_battery_type',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '',
})
# ---
# name: test_sensors[eve_contact_sensor][sensor.eve_door_voltage-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
@ -1883,52 +1745,6 @@
'state': '100',
})
# ---
# name: test_sensors[eve_thermo][sensor.eve_thermo_battery_type-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': None,
'config_entry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
'entity_id': 'sensor.eve_thermo_battery_type',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'options': dict({
}),
'original_device_class': None,
'original_icon': None,
'original_name': 'Battery type',
'platform': 'matter',
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'battery_replacement_description',
'unique_id': '00000000000004D2-0000000000000021-MatterNodeDevice-0-PowerSourceBatReplacementDescription-47-19',
'unit_of_measurement': None,
})
# ---
# name: test_sensors[eve_thermo][sensor.eve_thermo_battery_type-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Eve Thermo Battery type',
}),
'context': <ANY>,
'entity_id': 'sensor.eve_thermo_battery_type',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '',
})
# ---
# name: test_sensors[eve_thermo][sensor.eve_thermo_valve_position-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
@ -2081,52 +1897,6 @@
'state': '100',
})
# ---
# name: test_sensors[eve_weather_sensor][sensor.eve_weather_battery_type-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': None,
'config_entry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
'entity_id': 'sensor.eve_weather_battery_type',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'options': dict({
}),
'original_device_class': None,
'original_icon': None,
'original_name': 'Battery type',
'platform': 'matter',
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'battery_replacement_description',
'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-0-PowerSourceBatReplacementDescription-47-19',
'unit_of_measurement': None,
})
# ---
# name: test_sensors[eve_weather_sensor][sensor.eve_weather_battery_type-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Eve Weather Battery type',
}),
'context': <ANY>,
'entity_id': 'sensor.eve_weather_battery_type',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '',
})
# ---
# name: test_sensors[eve_weather_sensor][sensor.eve_weather_humidity-entry]
EntityRegistryEntrySnapshot({
'aliases': set({

View File

@ -193,6 +193,12 @@ async def test_battery_sensor_description(
assert state
assert state.state == "CR2032"
# case with a empty string to check if the attribute is indeed ignored
set_node_attribute(matter_node, 1, 47, 19, "")
await trigger_subscription_callback(hass, matter_client)
state = hass.states.get("sensor.smoke_sensor_battery_type") is None
@pytest.mark.parametrize("node_fixture", ["eve_thermo"])
async def test_eve_thermo_sensor(