From 323810e31a51dbc00ef62a62fb95e7e5e759aa32 Mon Sep 17 00:00:00 2001 From: mkmer Date: Mon, 2 Jan 2023 15:47:36 -0500 Subject: [PATCH] Bump AIOAladdinConnect to 0.1.50 (#85006) --- .../components/aladdin_connect/cover.py | 18 ++++------ .../components/aladdin_connect/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- .../components/aladdin_connect/test_cover.py | 34 ------------------- 5 files changed, 10 insertions(+), 48 deletions(-) diff --git a/homeassistant/components/aladdin_connect/cover.py b/homeassistant/components/aladdin_connect/cover.py index 532261339b0..8815ccdbb95 100644 --- a/homeassistant/components/aladdin_connect/cover.py +++ b/homeassistant/components/aladdin_connect/cover.py @@ -91,31 +91,27 @@ class AladdinDevice(CoverEntity): self._name = device["name"] self._serial = device["serial"] self._model = device["model"] - self._attr_unique_id = f"{self._device_id}-{self._number}" - self._attr_has_entity_name = True - @property - def device_info(self) -> DeviceInfo | None: - """Device information for Aladdin Connect cover.""" - return DeviceInfo( + self._attr_device_info = DeviceInfo( identifiers={(DOMAIN, f"{self._device_id}-{self._number}")}, name=self._name, manufacturer="Overhead Door", model=self._model, ) + self._attr_has_entity_name = True + self._attr_unique_id = f"{self._device_id}-{self._number}" async def async_added_to_hass(self) -> None: """Connect Aladdin Connect to the cloud.""" - async def update_callback() -> None: - """Schedule a state update.""" - self.async_write_ha_state() - - self._acc.register_callback(update_callback, self._serial, self._number) + self._acc.register_callback( + self.async_write_ha_state, self._serial, self._number + ) await self._acc.get_doors(self._serial) async def async_will_remove_from_hass(self) -> None: """Close Aladdin Connect before removing.""" + self._acc.unregister_callback(self._serial, self._number) await self._acc.close() async def async_close_cover(self, **kwargs: Any) -> None: diff --git a/homeassistant/components/aladdin_connect/manifest.json b/homeassistant/components/aladdin_connect/manifest.json index 71ad99a640d..17ae963bb27 100644 --- a/homeassistant/components/aladdin_connect/manifest.json +++ b/homeassistant/components/aladdin_connect/manifest.json @@ -2,7 +2,7 @@ "domain": "aladdin_connect", "name": "Aladdin Connect", "documentation": "https://www.home-assistant.io/integrations/aladdin_connect", - "requirements": ["AIOAladdinConnect==0.1.48"], + "requirements": ["AIOAladdinConnect==0.1.50"], "codeowners": ["@mkmer"], "iot_class": "cloud_polling", "loggers": ["aladdin_connect"], diff --git a/requirements_all.txt b/requirements_all.txt index 21cc2669545..b055ed82436 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -5,7 +5,7 @@ AEMET-OpenData==0.2.1 # homeassistant.components.aladdin_connect -AIOAladdinConnect==0.1.48 +AIOAladdinConnect==0.1.50 # homeassistant.components.adax Adax-local==0.1.5 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index b97f667166e..f82d0ac3c07 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -7,7 +7,7 @@ AEMET-OpenData==0.2.1 # homeassistant.components.aladdin_connect -AIOAladdinConnect==0.1.48 +AIOAladdinConnect==0.1.50 # homeassistant.components.adax Adax-local==0.1.5 diff --git a/tests/components/aladdin_connect/test_cover.py b/tests/components/aladdin_connect/test_cover.py index 4e65607fa9d..2192017c26f 100644 --- a/tests/components/aladdin_connect/test_cover.py +++ b/tests/components/aladdin_connect/test_cover.py @@ -231,37 +231,3 @@ async def test_yaml_import( config_data = hass.config_entries.async_entries(DOMAIN)[0].data assert config_data[CONF_USERNAME] == "test-user" assert config_data[CONF_PASSWORD] == "test-password" - - -async def test_callback( - hass: HomeAssistant, - mock_aladdinconnect_api: MagicMock, -): - """Test callback from Aladdin Connect API.""" - config_entry = MockConfigEntry( - domain=DOMAIN, - data=YAML_CONFIG, - unique_id="test-id", - ) - config_entry.add_to_hass(hass) - await hass.async_block_till_done() - - with patch( - "homeassistant.components.aladdin_connect.AladdinConnectClient", - return_value=mock_aladdinconnect_api, - ): - await hass.config_entries.async_setup(config_entry.entry_id) - await hass.async_block_till_done() - - mock_aladdinconnect_api.async_get_door_status.return_value = STATE_CLOSING - mock_aladdinconnect_api.get_door_status.return_value = STATE_CLOSING - with patch( - "homeassistant.components.aladdin_connect.AladdinConnectClient", - return_value=mock_aladdinconnect_api, - ), patch( - "homeassistant.components.aladdin_connect.AladdinConnectClient._call_back", - AsyncMock(), - ): - callback = mock_aladdinconnect_api.register_callback.call_args[0][0] - await callback() - assert hass.states.get("cover.home").state == STATE_CLOSING