Merge pull request #331 from plugwise/version_to_model

Fix for #294

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Ongoing
+
+- Repair coverage/fix testing - #294
+
 ## V0.31.6: Fix domestic_hot_water_setpoint-related bug for Anna + Elga
 
 - Add guarding for popping domestic_hot_water_setpoint

fixtures/adam_plus_anna/all_data.json

@@ -91,7 +91,6 @@
       "dev_class": "computer_desktop",
       "firmware": "2019-06-21T02:00:00+02:00",
       "location": "5ccb6c41a7d9403988d261ceee04239f",
-      "model": "Plug",
       "name": "Work-PC",
       "sensors": {
         "electricity_consumed": 79.8,

plugwise/helper.py

@@ -463,22 +463,23 @@ def _get_module_data(
             module = self._modules.find(loc)
             if module is not None:  # pylint: disable=consider-using-assignment-expr
                 model_data["contents"] = True
-                model_data["vendor_name"] = module.find("vendor_name").text
-                if model_data["vendor_name"] == "Plugwise B.V.":
-                    model_data["vendor_name"] = "Plugwise"
+                if (vendor_name := module.find("vendor_name").text) is not None:
+                    model_data["vendor_name"] = vendor_name
+                    if "Plugwise" in vendor_name:
+                        model_data["vendor_name"] = vendor_name.split(" ", 1)[0]
                 model_data["vendor_model"] = module.find("vendor_model").text
                 model_data["hardware_version"] = module.find("hardware_version").text
                 model_data["firmware_version"] = module.find("firmware_version").text
                 # Adam
-                if found := module.find("./protocols/zig_bee_node"):
-                    model_data["zigbee_mac_address"] = found.find("mac_address").text
-                    model_data["reachable"] = found.find("reachable").text == "true"
+                if zb_node := module.find("./protocols/zig_bee_node"):
+                    model_data["zigbee_mac_address"] = zb_node.find("mac_address").text
+                    model_data["reachable"] = zb_node.find("reachable").text == "true"
                 # Stretches
-                if found := module.find("./protocols/network_router"):
-                    model_data["zigbee_mac_address"] = found.find("mac_address").text
+                if router := module.find("./protocols/network_router"):
+                    model_data["zigbee_mac_address"] = router.find("mac_address").text
                 # Also look for the Circle+/Stealth M+
-                if found := module.find("./protocols/network_coordinator"):
-                    model_data["zigbee_mac_address"] = found.find("mac_address").text
+                if coord := module.find("./protocols/network_coordinator"):
+                    model_data["zigbee_mac_address"] = coord.find("mac_address").text
 
         return model_data
 

plugwise/util.py

@@ -85,7 +85,7 @@ def in_between(
 def version_to_model(version: str | None) -> str | None:
     """Translate hardware_version to device type."""
 
-    if version is None:  # pragma: no cover #294
+    if version is None:
         return version
 
     model = HW_MODELS.get(version)

tests/test_smile.py

@@ -1529,7 +1529,6 @@ async def test_connect_adam_plus_anna(self):
                 "dev_class": "computer_desktop",
                 "firmware": "2019-06-21T02:00:00+02:00",
                 "location": "5ccb6c41a7d9403988d261ceee04239f",
-                "model": "Plug",
                 "name": "Work-PC",
                 "zigbee_mac_address": "ABCD012345670A02",
                 "vendor": "Plugwise",
@@ -1558,7 +1557,7 @@ async def test_connect_adam_plus_anna(self):
 
         await self.device_test(smile, testdata)
         assert smile.gateway_id == "b128b4bbbd1f47e9bf4d756e8fb5ee94"
-        assert self.device_items == 72
+        assert self.device_items == 71
         assert "6fb89e35caeb4b1cb275184895202d84" in self.notifications
 
         result = await self.tinker_thermostat(
@@ -3925,14 +3924,13 @@ async def test_connect_anna_heatpump_cooling(self):
         assert smile._cooling_active
 
         with pytest.raises(pw_exceptions.PlugwiseError):
-            result = await self.tinker_thermostat(
+            await self.tinker_thermostat(
                 smile,
                 "c784ee9fdab44e1395b8dee7d7a497d5",
                 good_schedules=[
                     "standaard",
                 ],
             )
-            assert result
 
         await smile.close_connection()
         await self.disconnect(server, client)
@@ -4374,14 +4372,13 @@ async def test_connect_anna_loria_heating_idle(self):
         assert switch_change
 
         with pytest.raises(pw_exceptions.PlugwiseError):
-            result = await self.tinker_thermostat(
+            await self.tinker_thermostat(
                 smile,
                 "15da035090b847e7a21f93e08c015ebc",
                 good_schedules=[
                     "Winter",
                 ],
             )
-            assert result
 
         await self.tinker_dhw_mode(smile)
 

userdata/adam_plus_anna/core.modules.xml

@@ -241,7 +241,7 @@
 	</module>
 	<module id='72b2aa43d2ea4a33b23ade5e6629de8d'>
 		<vendor_name>Plugwise</vendor_name>
-		<vendor_model>160-01</vendor_model>
+		<vendor_model></vendor_model>
 		<hardware_version></hardware_version>
 		<firmware_version>2019-06-21T02:00:00+02:00</firmware_version>
 		<created_date>2020-02-29T22:56:58.823+01:00</created_date>