Commit 2fb1e40

agnersballoob

and

committed

Convert disabled_by to DeviceEntryDisabler on load (home-assistant#63944)

Co-authored-by: Paulus Schoutsen <balloob@gmail.com>

1 parent 7320904 commit 2fb1e40Copy full SHA for 2fb1e40

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -584,7 +584,9 @@ async def async_load(self) -> None:`
`584`	`584`	`configuration_url=device["configuration_url"],`
`585`	`585`	`# type ignores (if tuple arg was cast): likely https://github.com/python/mypy/issues/8625`
`586`	`586`	`connections={tuple(conn) for conn in device["connections"]}, # type: ignore[misc]`
`587`		`- disabled_by=device["disabled_by"],`
	`587`	`+ disabled_by=DeviceEntryDisabler(device["disabled_by"])`
	`588`	`+ if device["disabled_by"]`
	`589`	`+ else None,`
`588`	`590`	`entry_type=DeviceEntryType(device["entry_type"])`
`589`	`591`	`if device["entry_type"]`
`590`	`592`	`else None,`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -640,6 +640,7 @@ async def test_loading_saving_data(hass, registry, area_registry):`
`640`	`640`	`identifiers={("hue", "abc")},`
`641`	`641`	`manufacturer="manufacturer",`
`642`	`642`	`model="light",`
	`643`	`+ entry_type=device_registry.DeviceEntryType.SERVICE,`
`643`	`644`	`)`
`644`	`645`
`645`	`646`	`assert orig_light4.id == orig_light3.id`
`@@ -679,6 +680,15 @@ async def test_loading_saving_data(hass, registry, area_registry):`
`679`	`680`	`assert orig_light == new_light`
`680`	`681`	`assert orig_light4 == new_light4`
`681`	`682`
	`683`	`+ # Ensure enums converted`
	`684`	`+ for (old, new) in (`
	`685`	`+ (orig_via, new_via),`
	`686`	`+ (orig_light, new_light),`
	`687`	`+ (orig_light4, new_light4),`
	`688`	`+ ):`
	`689`	`+ assert old.disabled_by is new.disabled_by`
	`690`	`+ assert old.entry_type is new.entry_type`
	`691`	`+`
`682`	`692`	`# Ensure a save/load cycle does not keep suggested area`
`683`	`693`	`new_kitchen_light = registry2.async_get_device({("hue", "999")})`
`684`	`694`	`assert orig_kitchen_light.suggested_area == "Kitchen"`

Comments

(0)