plugwise 0.38.0__tar.gz → 0.38.2__tar.gz

{plugwise-0.38.0 → plugwise-0.38.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 0.38.0
+Version: 0.38.2
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners

{plugwise-0.38.0 → plugwise-0.38.2}/plugwise/__init__.py

@@ -5,6 +5,7 @@ Plugwise backend module for Home Assistant Core.
 from __future__ import annotations
 
 from plugwise.constants import (
+    DEFAULT_LEGACY_TIMEOUT,
     DEFAULT_PORT,
     DEFAULT_TIMEOUT,
     DEFAULT_USERNAME,
@@ -46,7 +47,7 @@ class Smile(SmileComm):
         websession: aiohttp.ClientSession,
         username: str = DEFAULT_USERNAME,
         port: int = DEFAULT_PORT,
-        timeout: float = DEFAULT_TIMEOUT,
+        timeout: float = DEFAULT_LEGACY_TIMEOUT,
 
     ) -> None:
         """Set the constructor for this class."""
@@ -128,6 +129,7 @@ class Smile(SmileComm):
         self._smile_api = SmileAPI(
             self._host,
             self._passwd,
+            self._timeout,
             self._websession,
             self._cooling_present,
             self._elga,
@@ -147,10 +149,10 @@ class Smile(SmileComm):
             self.smile_type,
             self._user,
             self._port,
-            self._timeout,
          ) if not self.smile_legacy else SmileLegacyAPI(
             self._host,
             self._passwd,
+            self._timeout,
             self._websession,
             self._is_thermostat,
             self._on_off_device,
@@ -168,7 +170,6 @@ class Smile(SmileComm):
             self.smile_zigbee_mac_address,
             self._user,
             self._port,
-            self._timeout,
         )
 
         # Update all endpoints on first connect
@@ -192,6 +193,9 @@ class Smile(SmileComm):
         else:
             model = await self._smile_detect_legacy(result, dsmrmain, model)
 
+        if not self.smile_legacy:
+            self._timeout = DEFAULT_TIMEOUT
+
         if model == "Unknown" or self.smile_fw_version is None:  # pragma: no cover
             # Corner case check
             LOGGER.error(
@@ -324,7 +328,10 @@ class Smile(SmileComm):
         state: str | None = None,
     ) -> None:
         """Set the selected option for the applicable Select."""
-        await self._smile_api.set_select(key, loc_id, option, state)
+        try:
+            await self._smile_api.set_select(key, loc_id, option, state)
+        except ConnectionFailedError as exc:
+            raise ConnectionFailedError(f"Failed to set select option '{option}': {str(exc)}") from exc
 
     async def set_schedule_state(
         self,
@@ -333,15 +340,25 @@ class Smile(SmileComm):
         name: str | None = None,
     ) -> None:
         """Activate/deactivate the Schedule, with the given name, on the relevant Thermostat."""
-        await self._smile_api.set_schedule_state(loc_id, state, name)
+        try:
+            await self._smile_api.set_schedule_state(loc_id, state, name)
+        except ConnectionFailedError as exc:  # pragma no cover
+            raise ConnectionFailedError(f"Failed to set schedule state: {str(exc)}") from exc  # pragma no cover
+
 
     async def set_preset(self, loc_id: str, preset: str) -> None:
         """Set the given Preset on the relevant Thermostat."""
-        await self._smile_api.set_preset(loc_id, preset)
+        try:
+            await self._smile_api.set_preset(loc_id, preset)
+        except ConnectionFailedError as exc:
+            raise ConnectionFailedError(f"Failed to set preset: {str(exc)}") from exc
 
     async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""
-        await self._smile_api.set_temperature(loc_id, items)
+        try:
+            await self._smile_api.set_temperature(loc_id, items)
+        except ConnectionFailedError as exc:
+            raise ConnectionFailedError(f"Failed to set temperature: {str(exc)}") from exc
 
     async def set_number(
         self,
@@ -350,40 +367,58 @@ class Smile(SmileComm):
         temperature: float,
     ) -> None:
         """Set the maximum boiler- or DHW-setpoint on the Central Heating boiler or the temperature-offset on a Thermostat."""
-        await self._smile_api.set_number(dev_id, key, temperature)
+        try:
+            await self._smile_api.set_number(dev_id, key, temperature)
+        except ConnectionFailedError as exc:
+            raise ConnectionFailedError(f"Failed to set number '{key}': {str(exc)}") from exc
 
     async def set_temperature_offset(self, dev_id: str, offset: float) -> None:
         """Set the Temperature offset for thermostats that support this feature."""
-        await self._smile_api.set_offset(dev_id, offset)  # pragma: no cover
+        try:  # pragma no cover
+            await self._smile_api.set_offset(dev_id, offset)  # pragma: no cover
+        except ConnectionFailedError as exc:  # pragma no cover
+            raise ConnectionFailedError(f"Failed to set temperature offset: {str(exc)}") from exc  # pragma no cover
 
     async def set_switch_state(
         self, appl_id: str, members: list[str] | None, model: str, state: str
     ) -> None:
         """Set the given State of the relevant Switch."""
-        await self._smile_api.set_switch_state(appl_id, members, model, state)
+        try:
+            await self._smile_api.set_switch_state(appl_id, members, model, state)
+        except ConnectionFailedError as exc:
+            raise ConnectionFailedError(f"Failed to set switch state: {str(exc)}") from exc
 
     async def set_gateway_mode(self, mode: str) -> None:
         """Set the gateway mode."""
-        await self._smile_api.set_gateway_mode(mode)  # pragma: no cover
+        try:  # pragma no cover
+            await self._smile_api.set_gateway_mode(mode)  # pragma: no cover
+        except ConnectionFailedError as exc:  # pragma no cover
+            raise ConnectionFailedError(f"Failed to set gateway mode: {str(exc)}") from exc  # pragma no cover
 
     async def set_regulation_mode(self, mode: str) -> None:
         """Set the heating regulation mode."""
-        await self._smile_api.set_regulation_mode(mode)  # pragma: no cover
+        try:  # pragma no cover
+            await self._smile_api.set_regulation_mode(mode)  # pragma: no cover
+        except ConnectionFailedError as exc:  # pragma no cover
+            raise ConnectionFailedError(f"Failed to set regulation mode: {str(exc)}") from exc  # pragma no cover
 
     async def set_dhw_mode(self, mode: str) -> None:
         """Set the domestic hot water heating regulation mode."""
-        await self._smile_api.set_dhw_mode(mode)  # pragma: no cover
+        try:  # pragma no cover
+            await self._smile_api.set_dhw_mode(mode)  # pragma: no cover
+        except ConnectionFailedError as exc:  # pragma no cover
+            raise ConnectionFailedError(f"Failed to set dhw mode: {str(exc)}") from exc  # pragma no cover
 
     async def delete_notification(self) -> None:
         """Delete the active Plugwise Notification."""
         try:
             await self._smile_api.delete_notification()
         except ConnectionFailedError as exc:
-            raise PlugwiseError(f"Failed to delete notification: {str(exc)}") from exc
+            raise ConnectionFailedError(f"Failed to delete notification: {str(exc)}") from exc
 
     async def reboot_gateway(self) -> None:
         """Reboot the Plugwise Gateway."""
         try:
             await self._smile_api.reboot_gateway()
         except ConnectionFailedError as exc:
-            raise PlugwiseError(f"Failed to reboot gateway: {str(exc)}") from exc
+            raise ConnectionFailedError(f"Failed to reboot gateway: {str(exc)}") from exc

{plugwise-0.38.0 → plugwise-0.38.2}/plugwise/constants.py

@@ -32,7 +32,8 @@ VOLUME_CUBIC_METERS_PER_HOUR: Final = "m³/h"
 
 ADAM: Final = "Adam"
 ANNA: Final = "Smile Anna"
-DEFAULT_TIMEOUT: Final = 30
+DEFAULT_TIMEOUT: Final = 10
+DEFAULT_LEGACY_TIMEOUT: Final = 30
 DEFAULT_USERNAME: Final = "smile"
 DEFAULT_PORT: Final = 80
 DEFAULT_PW_MAX: Final = 30.0

{plugwise-0.38.0 → plugwise-0.38.2}/plugwise/helper.py

@@ -115,30 +115,31 @@ class SmileComm:
         use_headers = headers
 
         try:
-            if method == "delete":
-                resp = await self._websession.delete(url, auth=self._auth)
-            if method == "get":
-                # Work-around for Stretchv2, should not hurt the other smiles
-                use_headers = {"Accept-Encoding": "gzip"}
-                resp = await self._websession.get(
-                    url, headers=use_headers, auth=self._auth
-                )
-            if method == "post":
-                use_headers = {"Content-type": "text/xml"}
-                resp = await self._websession.post(
-                    url,
-                    headers=use_headers,
-                    data=data,
-                    auth=self._auth,
-                )
-            if method == "put":
-                use_headers = {"Content-type": "text/xml"}
-                resp = await self._websession.put(
-                    url,
-                    headers=use_headers,
-                    data=data,
-                    auth=self._auth,
-                )
+            match method:
+                case "delete":
+                    resp = await self._websession.delete(url, auth=self._auth)
+                case "get":
+                    # Work-around for Stretchv2, should not hurt the other smiles
+                    use_headers = {"Accept-Encoding": "gzip"}
+                    resp = await self._websession.get(
+                        url, headers=use_headers, auth=self._auth
+                    )
+                case "post":
+                    use_headers = {"Content-type": "text/xml"}
+                    resp = await self._websession.post(
+                        url,
+                        headers=use_headers,
+                        data=data,
+                        auth=self._auth,
+                    )
+                case "put":
+                    use_headers = {"Content-type": "text/xml"}
+                    resp = await self._websession.put(
+                        url,
+                        headers=use_headers,
+                        data=data,
+                        auth=self._auth,
+                    )
         except (
             ClientError
         ) as exc:  # ClientError is an ancestor class of ServerTimeoutError
@@ -167,23 +168,22 @@ class SmileComm:
 
     async def _request_validate(self, resp: ClientResponse, method: str) -> etree:
         """Helper-function for _request(): validate the returned data."""
-        # Command accepted gives empty body with status 202
-        if resp.status == 202:
-            return
-
-        # Cornercase for server not responding with 202
-        if method in ("post", "put") and resp.status == 200:
-            return
-
-        if resp.status == 401:
-            msg = "Invalid Plugwise login, please retry with the correct credentials."
-            LOGGER.error("%s", msg)
-            raise InvalidAuthentication
-
-        if resp.status == 405:
-            msg = "405 Method not allowed."
-            LOGGER.error("%s", msg)
-            raise ConnectionFailedError
+        match resp.status:
+            case 200:
+                # Cornercases for server not responding with 202
+                if method in ("post", "put"):
+                    return
+            case 202:
+                # Command accepted gives empty body with status 202
+                return
+            case 401:
+                msg = "Invalid Plugwise login, please retry with the correct credentials."
+                LOGGER.error("%s", msg)
+                raise InvalidAuthentication
+            case 405:
+                msg = "405 Method not allowed."
+                LOGGER.error("%s", msg)
+                raise ConnectionFailedError
 
         if not (result := await resp.text()) or (
             "<error>" in result and "Not started" not in result

{plugwise-0.38.0 → plugwise-0.38.2}/plugwise/legacy/smile.py

@@ -5,11 +5,11 @@ Plugwise backend module for Home Assistant Core - covering the legacy P1, Anna,
 from __future__ import annotations
 
 import datetime as dt
+from typing import Any
 
 from plugwise.constants import (
     APPLIANCES,
     DEFAULT_PORT,
-    DEFAULT_TIMEOUT,
     DEFAULT_USERNAME,
     DOMAIN_OBJECTS,
     LOCATIONS,
@@ -23,7 +23,7 @@ from plugwise.constants import (
     PlugwiseData,
     ThermoLoc,
 )
-from plugwise.exceptions import PlugwiseError
+from plugwise.exceptions import ConnectionFailedError, PlugwiseError
 from plugwise.helper import SmileComm
 from plugwise.legacy.data import SmileLegacyData
 
@@ -40,6 +40,7 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
         self,
         host: str,
         password: str,
+        timeout: float,
         websession: aiohttp.ClientSession,
         _is_thermostat: bool,
         _on_off_device: bool,
@@ -57,7 +58,6 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
         smile_zigbee_mac_address: str | None,
         username: str = DEFAULT_USERNAME,
         port: int = DEFAULT_PORT,
-        timeout: float = DEFAULT_TIMEOUT,
     ) -> None:
         """Set the constructor for this class."""
         super().__init__(
@@ -76,6 +76,7 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
         self._opentherm_device = _opentherm_device
         self._stretch_v2 = _stretch_v2
         self._target_smile = _target_smile
+        self._timeout = timeout
         self.loc_data = loc_data
         self.smile_fw_version = smile_fw_version
         self.smile_hostname = smile_hostname
@@ -180,7 +181,7 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
         rule = self._domain_objects.find(locator)
         data = f'<rules><rule id="{rule.attrib["id"]}"><active>true</active></rule></rules>'
 
-        await self._request(RULES, method="put", data=data)
+        await self.call_request(RULES, method="put", data=data)
 
     async def set_regulation_mode(self, mode: str) -> None:
         """Set-function placeholder for legacy devices."""
@@ -226,7 +227,7 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
             f' id="{template_id}" /><active>{new_state}</active></rule></rules>'
         )
 
-        await self._request(uri, method="put", data=data)
+        await self.call_request(uri, method="put", data=data)
 
     async def set_switch_state(
         self, appl_id: str, members: list[str] | None, model: str, state: str
@@ -254,7 +255,7 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
             if self._appliances.find(locator).text == "true":
                 raise PlugwiseError("Plugwise: the locked Relay was not switched.")
 
-        await self._request(uri, method="put", data=data)
+        await self.call_request(uri, method="put", data=data)
 
     async def _set_groupswitch_member_state(
         self, members: list[str], state: str, switch: Munch
@@ -267,7 +268,7 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
             uri = f"{APPLIANCES};id={member}/{switch.func_type}"
             data = f"<{switch.func_type}><{switch.func}>{state}</{switch.func}></{switch.func_type}>"
 
-            await self._request(uri, method="put", data=data)
+            await self.call_request(uri, method="put", data=data)
 
     async def set_temperature(self, _: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""
@@ -287,4 +288,13 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
             f"{temperature}</setpoint></thermostat_functionality>"
         )
 
-        await self._request(uri, method="put", data=data)
+        await self.call_request(uri, method="put", data=data)
+
+    async def call_request(self, uri: str, **kwargs: Any) -> None:
+        """ConnectionFailedError wrapper for calling _request()."""
+        method: str = kwargs["method"]
+        data: str | None = kwargs.get("data")
+        try:
+            await self._request(uri, method=method, data=data)
+        except ConnectionFailedError as exc:
+            raise ConnectionFailedError from exc

{plugwise-0.38.0 → plugwise-0.38.2}/plugwise/smile.py

@@ -12,7 +12,6 @@ from plugwise.constants import (
     ANNA,
     APPLIANCES,
     DEFAULT_PORT,
-    DEFAULT_TIMEOUT,
     DEFAULT_USERNAME,
     DOMAIN_OBJECTS,
     GATEWAY_REBOOT,
@@ -47,6 +46,7 @@ class SmileAPI(SmileComm, SmileData):
         self,
         host: str,
         password: str,
+        timeout: float,
         websession: aiohttp.ClientSession,
         _cooling_present: bool,
         _elga: bool,
@@ -66,8 +66,6 @@ class SmileAPI(SmileComm, SmileData):
         smile_type: str,
         username: str = DEFAULT_USERNAME,
         port: int = DEFAULT_PORT,
-        timeout: float = DEFAULT_TIMEOUT,
-
     ) -> None:
         """Set the constructor for this class."""
         super().__init__(
@@ -87,6 +85,7 @@ class SmileAPI(SmileComm, SmileData):
         self._on_off_device = _on_off_device
         self._opentherm_device = _opentherm_device
         self._schedule_old_states = _schedule_old_states
+        self._timeout = timeout
         self.gateway_id = gateway_id
         self.loc_data = loc_data
         self.smile_fw_version = smile_fw_version
@@ -149,14 +148,6 @@ class SmileAPI(SmileComm, SmileData):
 ###  API Set and HA Service-related Functions                                                        ###
 ########################################################################################################
 
-    async def call_request(self, uri: str, **kwargs: Any) -> None:
-        """ConnectionFailedError wrapper for calling _request()."""
-        method: str = kwargs["method"]
-        try:
-            await self._request(uri, method=method)
-        except ConnectionFailedError as exc:
-            raise ConnectionFailedError from exc
-
     async def delete_notification(self) -> None:
         """Delete the active Plugwise Notification."""
         await self.call_request(NOTIFICATIONS, method="delete")
@@ -189,7 +180,7 @@ class SmileAPI(SmileComm, SmileData):
 
         uri = f"{APPLIANCES};id={self._heater_id}/thermostat;id={thermostat_id}"
         data = f"<thermostat_functionality><setpoint>{temp}</setpoint></thermostat_functionality>"
-        await self._request(uri, method="put", data=data)
+        await self.call_request(uri, method="put", data=data)
 
     async def set_offset(self, dev_id: str, offset: float) -> None:
         """Set the Temperature offset for thermostats that support this feature."""
@@ -202,7 +193,7 @@ class SmileAPI(SmileComm, SmileData):
         uri = f"{APPLIANCES};id={dev_id}/offset;type=temperature_offset"
         data = f"<offset_functionality><offset>{value}</offset></offset_functionality>"
 
-        await self._request(uri, method="put", data=data)
+        await self.call_request(uri, method="put", data=data)
 
     async def set_preset(self, loc_id: str, preset: str) -> None:
         """Set the given Preset on the relevant Thermostat - from LOCATIONS."""
@@ -222,7 +213,7 @@ class SmileAPI(SmileComm, SmileData):
             f"</type><preset>{preset}</preset></location></locations>"
         )
 
-        await self._request(uri, method="put", data=data)
+        await self.call_request(uri, method="put", data=data)
 
     async def set_select(self, key: str, loc_id: str, option: str, state: str | None) -> None:
         """Set a dhw/gateway/regulation mode or the thermostat schedule option."""
@@ -245,7 +236,7 @@ class SmileAPI(SmileComm, SmileData):
         uri = f"{APPLIANCES};type=heater_central/domestic_hot_water_mode_control"
         data = f"<domestic_hot_water_mode_control_functionality><mode>{mode}</mode></domestic_hot_water_mode_control_functionality>"
 
-        await self._request(uri, method="put", data=data)
+        await self.call_request(uri, method="put", data=data)
 
     async def set_gateway_mode(self, mode: str) -> None:
         """Set the gateway mode."""
@@ -268,7 +259,7 @@ class SmileAPI(SmileComm, SmileData):
         uri = f"{APPLIANCES};id={self.gateway_id}/gateway_mode_control"
         data = f"<gateway_mode_control_functionality><mode>{mode}</mode>{valid}</gateway_mode_control_functionality>"
 
-        await self._request(uri, method="put", data=data)
+        await self.call_request(uri, method="put", data=data)
 
     async def set_regulation_mode(self, mode: str) -> None:
         """Set the heating regulation mode."""
@@ -281,7 +272,7 @@ class SmileAPI(SmileComm, SmileData):
             duration = "<duration>300</duration>"
         data = f"<regulation_mode_control_functionality>{duration}<mode>{mode}</mode></regulation_mode_control_functionality>"
 
-        await self._request(uri, method="put", data=data)
+        await self.call_request(uri, method="put", data=data)
 
     async def set_schedule_state(
         self,
@@ -335,7 +326,7 @@ class SmileAPI(SmileComm, SmileData):
             f"{template}{contexts}</rule></rules>"
         )
 
-        await self._request(uri, method="put", data=data)
+        await self.call_request(uri, method="put", data=data)
         self._schedule_old_states[loc_id][name] = new_state
 
     def determine_contexts(
@@ -404,7 +395,7 @@ class SmileAPI(SmileComm, SmileData):
             if self._domain_objects.find(locator).text == "true":
                 raise PlugwiseError("Plugwise: the locked Relay was not switched.")
 
-        await self._request(uri, method="put", data=data)
+        await self.call_request(uri, method="put", data=data)
 
     async def _set_groupswitch_member_state(
         self, members: list[str], state: str, switch: Munch
@@ -419,7 +410,7 @@ class SmileAPI(SmileComm, SmileData):
             uri = f"{APPLIANCES};id={member}/{switch.device};id={switch_id}"
             data = f"<{switch.func_type}><{switch.func}>{state}</{switch.func}></{switch.func_type}>"
 
-            await self._request(uri, method="put", data=data)
+            await self.call_request(uri, method="put", data=data)
 
     async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""
@@ -460,4 +451,13 @@ class SmileAPI(SmileComm, SmileData):
             f"{temperature}</setpoint></thermostat_functionality>"
         )
 
-        await self._request(uri, method="put", data=data)
+        await self.call_request(uri, method="put", data=data)
+
+    async def call_request(self, uri: str, **kwargs: Any) -> None:
+        """ConnectionFailedError wrapper for calling _request()."""
+        method: str = kwargs["method"]
+        data: str | None = kwargs.get("data")
+        try:
+            await self._request(uri, method=method, data=data)
+        except ConnectionFailedError as exc:
+            raise ConnectionFailedError from exc

{plugwise-0.38.0 → plugwise-0.38.2}/plugwise.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 0.38.0
+Version: 0.38.2
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners

{plugwise-0.38.0 → plugwise-0.38.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "0.38.0"
+version         = "0.38.2"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"

{plugwise-0.38.0 → plugwise-0.38.2}/tests/test_adam.py

@@ -63,7 +63,7 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         await self.disconnect(server, client)
 
         server, smile, client = await self.connect_wrapper(raise_timeout=True)
-        await self.device_test(smile, "2022-05-16 00:00:01", testdata)
+        await self.device_test(smile, "2022-05-16 00:00:01", testdata, skip_testing=True)
         result = await self.tinker_thermostat(
             smile,
             "c50f167537524366a5af7aa3942feb1e",
@@ -79,15 +79,18 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         )
         assert result
 
+        tinkered = await self.tinker_max_boiler_temp(smile, unhappy=True)
+        assert not tinkered
+
         try:
             await smile.delete_notification()
             notification_deletion = False  # pragma: no cover
-        except pw_exceptions.PlugwiseError:
+        except pw_exceptions.ConnectionFailedError:
             notification_deletion = True
         assert notification_deletion
 
         reboot = await self.tinker_reboot(smile, unhappy=True)
-        assert not reboot
+        assert reboot
 
         await smile.close_connection()
         await self.disconnect(server, client)
@@ -212,7 +215,7 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         await self.disconnect(server, client)
 
         server, smile, client = await self.connect_wrapper(raise_timeout=True)
-        await self.device_test(smile, "2020-03-22 00:00:01", testdata)
+        await self.device_test(smile, "2020-03-22 00:00:01", testdata, skip_testing=True)
         result = await self.tinker_thermostat(
             smile,
             "009490cc2f674ce6b576863fbb64f867",
@@ -322,9 +325,14 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         )
         assert not switch_change
 
-        await self.tinker_gateway_mode(smile)
-        await self.tinker_regulation_mode(smile)
-        await self.tinker_max_boiler_temp(smile)
+        tinkered = await self.tinker_gateway_mode(smile)
+        assert not tinkered
+
+        tinkered = await self.tinker_regulation_mode(smile)
+        assert not tinkered
+
+        tinkered = await self.tinker_max_boiler_temp(smile)
+        assert not tinkered
 
         # Now change some data and change directory reading xml from
         # emulating reading newer dataset after an update_interval
@@ -353,6 +361,23 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         await smile.close_connection()
         await self.disconnect(server, client)
 
+        self.smile_setup = "adam_plus_anna_new"
+        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        server, smile, client = await self.connect_wrapper(raise_timeout=True)
+        await self.device_test(smile, "2023-12-17 00:00:01", testdata, skip_testing=True)
+
+        tinkered = await self.tinker_max_boiler_temp(smile, unhappy=True)
+        assert tinkered
+
+        tinkered = await self.tinker_gateway_mode(smile, unhappy=True)
+        assert tinkered
+
+        tinkered = await self.tinker_regulation_mode(smile, unhappy=True)
+        assert tinkered
+
+        await smile.close_connection()
+        await self.disconnect(server, client)
+
     @pytest.mark.asyncio
     async def test_adam_plus_jip(self):
         """Test Adam with Jip setup."""

{plugwise-0.38.0 → plugwise-0.38.2}/tests/test_anna.py

@@ -70,7 +70,7 @@ class TestPlugwiseAnna(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         server, smile, client = await self.connect_wrapper(raise_timeout=True)
         # Reset self.smile_setup
         self.smile_setup = "anna_v4"
-        await self.device_test(smile, "2020-04-05 00:00:01", testdata)
+        await self.device_test(smile, "2020-04-05 00:00:01", testdata, skip_testing=True)
         result = await self.tinker_thermostat(
             smile,
             "eb5309212bf5407bb143e5bfa3b18aee",
@@ -79,6 +79,12 @@ class TestPlugwiseAnna(TestPlugwise):  # pylint: disable=attribute-defined-outsi
             unhappy=True,
         )
         assert result
+
+        result = await self.tinker_temp_offset(
+            smile, "01b85360fdd243d0aaad4d6ac2a5ba7e", unhappy=True,
+        )
+        assert result
+
         await smile.close_connection()
         await self.disconnect(server, client)
 
@@ -458,11 +464,22 @@ class TestPlugwiseAnna(TestPlugwise):  # pylint: disable=attribute-defined-outsi
                 "ERROR raised setting block cooling: %s", exc.value
             )  # pragma: no cover
 
-        await self.tinker_dhw_mode(smile)
+        tinkered = await self.tinker_dhw_mode(smile)
+        assert not tinkered
 
         await smile.close_connection()
         await self.disconnect(server, client)
 
+        server, smile, client = await self.connect_wrapper(raise_timeout=True)
+        await self.device_test(smile, "2022-05-16 00:00:01", testdata, skip_testing=True)
+
+        tinkered = await self.tinker_dhw_mode(smile, unhappy=True)
+        assert tinkered
+
+        await smile.close_connection()
+        await self.disconnect(server, client)
+
+
     @pytest.mark.asyncio
     async def test_connect_anna_loria_cooling_active(self):
         """Test an Anna with a Loria in heating mode - state idle."""

{plugwise-0.38.0 → plugwise-0.38.2}/tests/test_init.py

@@ -536,6 +536,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         test_time=None,
         testdata=None,
         initialize=True,
+        skip_testing=False,
     ):
         """Perform basic device tests."""
         bsw_list = ["binary_sensors", "central", "climate", "sensors", "switches"]
@@ -551,8 +552,10 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
                     await smile.full_update_device()
                     smile.get_all_devices()
                     data = await smile.async_update()
+                    assert smile._timeout == 30
                 else:
                     data = await smile.async_update()
+                    assert smile._timeout == 10
             else:
                 _LOGGER.info("Asserting updated testdata:")
                 data = await smile.async_update()
@@ -588,6 +591,9 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         _LOGGER.info("Device list = %s", data.devices)
         self.show_setup(location_list, data.devices)
 
+        if skip_testing:
+            return
+
         # Perform tests and asserts
         tests = 0
         asserts = 0
@@ -644,10 +650,10 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             await smile.reboot_gateway()
             _LOGGER.info("  + worked as intended")
             return True
-        except pw_exceptions.PlugwiseError:
+        except pw_exceptions.ConnectionFailedError:
             if unhappy:
                 _LOGGER.info("  + failed as expected")
-                return False
+                return True
             else:  # pragma: no cover
                 _LOGGER.info("  - failed unexpectedly")
                 return False
@@ -659,8 +665,8 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         """Turn a Switch on and off to test functionality."""
         _LOGGER.info("Asserting modifying settings for switch devices:")
         _LOGGER.info("- Devices (%s):", dev_id)
+        tinker_switch_passed = False
         for new_state in ["false", "true", "false"]:
-            tinker_switch_passed = False
             _LOGGER.info("- Switching %s", new_state)
             try:
                 await smile.set_switch_state(dev_id, members, model, new_state)
@@ -669,9 +675,9 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + locked, not switched as expected")
                 return False
-            except pw_exceptions.ConnectionFailedError:
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
                 if unhappy:
-                    tinker_switch_passed = True  # test is pass!
+                    return True  # test is pass!
                     _LOGGER.info("  + failed as expected")
                 else:  # pragma: no cover
                     _LOGGER.info("  - failed unexpectedly")
@@ -697,18 +703,18 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         except pw_exceptions.ConnectionFailedError:
             if unhappy:
                 _LOGGER.info("  + tinker_thermostat_temp failed as expected")
-                tinker_temp_passed = True
+                return True
             else:  # pragma: no cover
                 _LOGGER.info("  - tinker_thermostat_temp failed unexpectedly")
-                tinker_temp_passed = False
+                return False
 
         return tinker_temp_passed
 
     @pytest.mark.asyncio
     async def tinker_thermostat_preset(self, smile, loc_id, unhappy=False):
         """Toggle preset to test functionality."""
+        tinker_preset_passed = False
         for new_preset in ["asleep", "home", BOGUS]:
-            tinker_preset_passed = False
             warning = ""
             if new_preset[0] == "!":
                 warning = " TTP Negative test"
@@ -721,10 +727,10 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + found invalid preset, as expected")
                 tinker_preset_passed = True
-            except pw_exceptions.ConnectionFailedError:
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
                 if unhappy:
-                    tinker_preset_passed = True
                     _LOGGER.info("  + tinker_thermostat_preset failed as expected")
+                    return True
                 else:  # pragma: no cover
                     _LOGGER.info("  - tinker_thermostat_preset failed unexpectedly")
                     return False
@@ -740,8 +746,9 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         if good_schedules != []:
             if not single and ("!VeryBogusSchedule" not in good_schedules):
                 good_schedules.append("!VeryBogusSchedule")
+
+            tinker_schedule_passed = False
             for new_schedule in good_schedules:
-                tinker_schedule_passed = False
                 warning = ""
                 if new_schedule is not None and new_schedule[0] == "!":
                     warning = " TTS Negative test"
@@ -754,11 +761,11 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
                 except pw_exceptions.PlugwiseError:
                     _LOGGER.info("  + failed as expected")
                     tinker_schedule_passed = True
-                except pw_exceptions.ConnectionFailedError:
+                except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
                     tinker_schedule_passed = False
                     if unhappy:
                         _LOGGER.info("  + failed as expected before intended failure")
-                        tinker_schedule_passed = True
+                        return True
                     else:  # pragma: no cover
                         _LOGGER.info("  - succeeded unexpectedly for some reason")
                         return False
@@ -772,6 +779,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
     async def tinker_legacy_thermostat_schedule(self, smile, unhappy=False):
         """Toggle schedules to test functionality."""
         states = ["on", "off", "!Bogus"]
+        tinker_schedule_passed = False
         for state in states:
             _LOGGER.info("- Adjusting schedule to state %s", state)
             try:
@@ -781,11 +789,11 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + failed as expected")
                 tinker_schedule_passed = True
-            except pw_exceptions.ConnectionFailedError:
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
                 tinker_schedule_passed = False
                 if unhappy:
                     _LOGGER.info("  + failed as expected before intended failure")
-                    tinker_schedule_passed = True
+                    return True
                 else:  # pragma: no cover
                     _LOGGER.info("  - succeeded unexpectedly for some reason")
                     return False
@@ -833,7 +841,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         smile,
         schedule_on=True,
         block_cooling=False,
-        unhappy=False
+        unhappy=False,
     ):
         """Toggle various climate settings to test functionality."""
         result_1 = await self.tinker_thermostat_temp(
@@ -847,8 +855,9 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         return result_1 and result_2 and result_3
 
     @staticmethod
-    async def tinker_dhw_mode(smile):
+    async def tinker_dhw_mode(smile, unhappy=False):
         """Toggle dhw to test functionality."""
+        tinker_dhw_mode_passed = False
         for mode in ["auto", "boost", BOGUS]:
             warning = ""
             if mode[0] == "!":
@@ -858,12 +867,24 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             try:
                 await smile.set_select("select_dhw_mode", "dummy", mode)
                 _LOGGER.info("  + tinker_dhw_mode worked as intended")
+                tinker_dhw_mode_passed = True
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + tinker_dhw_mode found invalid mode, as expected")
+                tinker_dhw_mode_passed = False
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
+                if unhappy:
+                    _LOGGER.info("  + failed as expected before intended failure")
+                    return True
+                else:  # pragma: no cover
+                    _LOGGER.info("  - succeeded unexpectedly for some reason")
+                    return False
+
+        return tinker_dhw_mode_passed
 
     @staticmethod
-    async def tinker_regulation_mode(smile):
+    async def tinker_regulation_mode(smile, unhappy=False):
         """Toggle regulation_mode to test functionality."""
+        tinker_reg_mode_passed = False
         for mode in ["off", "heating", "bleeding_cold", BOGUS]:
             warning = ""
             if mode[0] == "!":
@@ -873,25 +894,49 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             try:
                 await smile.set_select("select_regulation_mode", "dummy", mode)
                 _LOGGER.info("  + tinker_regulation_mode worked as intended")
+                tinker_reg_mode_passed = True
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info(
                     "  + tinker_regulation_mode found invalid mode, as expected"
                 )
+                tinker_reg_mode_passed = False
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
+                if unhappy:
+                    _LOGGER.info("  + failed as expected before intended failure")
+                    return True
+                else:  # pragma: no cover
+                    _LOGGER.info("  - succeeded unexpectedly for some reason")
+                    return False
+
+        return tinker_reg_mode_passed
 
     @staticmethod
-    async def tinker_max_boiler_temp(smile):
+    async def tinker_max_boiler_temp(smile, unhappy=False):
         """Change max boiler temp setpoint to test functionality."""
+        tinker_max_boiler_temp_passed = False
         new_temp = 60.0
         _LOGGER.info("- Adjusting temperature to %s", new_temp)
         for test in ["maximum_boiler_temperature", "bogus_temperature"]:
+            _LOGGER.info("  + for %s", test)
             try:
                 await smile.set_number("dummy", test, new_temp)
                 _LOGGER.info("  + tinker_max_boiler_temp worked as intended")
+                tinker_max_boiler_temp_passed = True
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + tinker_max_boiler_temp failed as intended")
+                tinker_max_boiler_temp_passed = False
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
+                if unhappy:
+                    _LOGGER.info("  + failed as expected before intended failure")
+                    return True
+                else:  # pragma: no cover
+                    _LOGGER.info("  - succeeded unexpectedly for some reason")
+                    return False
+
+        return tinker_max_boiler_temp_passed
 
     @staticmethod
-    async def tinker_temp_offset(smile, dev_id):
+    async def tinker_temp_offset(smile, dev_id, unhappy=False):
         """Change temperature_offset to test functionality."""
         new_offset = 1.0
         _LOGGER.info("- Adjusting temperature offset to %s", new_offset)
@@ -902,10 +947,18 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         except pw_exceptions.PlugwiseError:
             _LOGGER.info("  + tinker_temp_offset failed as intended")
             return False
+        except pw_exceptions.ConnectionFailedError:
+            if unhappy:
+                _LOGGER.info("  + failed as expected before intended failure")
+                return True
+            else:  # pragma: no cover
+                _LOGGER.info("  - succeeded unexpectedly for some reason")
+                return False
 
     @staticmethod
-    async def tinker_gateway_mode(smile):
+    async def tinker_gateway_mode(smile, unhappy=False):
         """Toggle gateway_mode to test functionality."""
+        tinker_gateway_mode_passed = False
         for mode in ["away", "full", "vacation", "!bogus"]:
             warning = ""
             if mode[0] == "!":
@@ -915,8 +968,19 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             try:
                 await smile.set_select("select_gateway_mode", "dummy", mode)
                 _LOGGER.info("  + worked as intended")
+                tinker_gateway_mode_passed = True
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + found invalid mode, as expected")
+                tinker_gateway_mode_passed = False
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
+                if unhappy:
+                    _LOGGER.info("  + failed as expected before intended failure")
+                    return True
+                else:  # pragma: no cover
+                    _LOGGER.info("  - succeeded unexpectedly for some reason")
+                    return False
+
+        return tinker_gateway_mode_passed
 
     @staticmethod
     def validate_test_basics(

{plugwise-0.38.0 → plugwise-0.38.2}/tests/test_legacy_anna.py

@@ -39,7 +39,7 @@ class TestPlugwiseAnna(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         await self.disconnect(server, client)
 
         server, smile, client = await self.connect_legacy_wrapper(raise_timeout=True)
-        await self.device_test(smile, "2020-03-22 00:00:01", testdata)
+        await self.device_test(smile, "2020-03-22 00:00:01", testdata, skip_testing=True)
         result = await self.tinker_legacy_thermostat(smile, unhappy=True)
         assert result
         await smile.close_connection()