From 7c15075231b5d46c56f268909417de3a7216b2a8 Mon Sep 17 00:00:00 2001
From: Martin Hjelmare <marhje52@gmail.com>
Date: Tue, 3 Sep 2024 15:49:11 +0200
Subject: [PATCH] Clean up Z-wave error log when raising in service handlers
 (#125138)

---
 homeassistant/components/zwave_js/entity.py | 5 +++--
 homeassistant/components/zwave_js/sensor.py | 7 +++----
 tests/components/zwave_js/test_sensor.py    | 7 ++++++-
 tests/components/zwave_js/test_switch.py    | 6 +++++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/zwave_js/entity.py b/homeassistant/components/zwave_js/entity.py
index 4a6f87cc032..d41c8bb01d0 100644
--- a/homeassistant/components/zwave_js/entity.py
+++ b/homeassistant/components/zwave_js/entity.py
@@ -335,5 +335,6 @@ class ZWaveBaseEntity(Entity):
                 value, new_value, options=options, wait_for_result=wait_for_result
             )
         except BaseZwaveJSServerError as err:
-            LOGGER.error("Unable to set value %s: %s", value.value_id, err)
-            raise HomeAssistantError from err
+            raise HomeAssistantError(
+                f"Unable to set value {value.value_id}: {err}"
+            ) from err
diff --git a/homeassistant/components/zwave_js/sensor.py b/homeassistant/components/zwave_js/sensor.py
index e43c620ff54..428bf504510 100644
--- a/homeassistant/components/zwave_js/sensor.py
+++ b/homeassistant/components/zwave_js/sensor.py
@@ -750,10 +750,9 @@ class ZWaveMeterSensor(ZWaveNumericSensor):
                 CommandClass.METER, "reset", *args, wait_for_result=False
             )
         except BaseZwaveJSServerError as err:
-            LOGGER.error(
-                "Failed to reset meters on node %s endpoint %s: %s", node, endpoint, err
-            )
-            raise HomeAssistantError from err
+            raise HomeAssistantError(
+                f"Failed to reset meters on node {node} endpoint {endpoint}: {err}"
+            ) from err
         LOGGER.debug(
             "Meters on node %s endpoint %s reset with the following options: %s",
             node,
diff --git a/tests/components/zwave_js/test_sensor.py b/tests/components/zwave_js/test_sensor.py
index 02b3df17e22..19f8aeece36 100644
--- a/tests/components/zwave_js/test_sensor.py
+++ b/tests/components/zwave_js/test_sensor.py
@@ -522,7 +522,7 @@ async def test_reset_meter(
         "test", 1, "test"
     )
 
-    with pytest.raises(HomeAssistantError):
+    with pytest.raises(HomeAssistantError) as err:
         await hass.services.async_call(
             DOMAIN,
             SERVICE_RESET_METER,
@@ -530,6 +530,11 @@ async def test_reset_meter(
             blocking=True,
         )
 
+    assert str(err.value) == (
+        "Failed to reset meters on node Node(node_id=102) endpoint 0: "
+        "zwave_error: Z-Wave error 1 - test"
+    )
+
 
 async def test_meter_attributes(
     hass: HomeAssistant, client, aeon_smart_switch_6, integration
diff --git a/tests/components/zwave_js/test_switch.py b/tests/components/zwave_js/test_switch.py
index c18c0c4359e..810ce38cf99 100644
--- a/tests/components/zwave_js/test_switch.py
+++ b/tests/components/zwave_js/test_switch.py
@@ -286,7 +286,11 @@ async def test_config_parameter_switch(
     client.async_send_command.side_effect = FailedZWaveCommand("test", 1, "test")
 
     # Test turning off error raises proper exception
-    with pytest.raises(HomeAssistantError):
+    with pytest.raises(HomeAssistantError) as err:
         await hass.services.async_call(
             DOMAIN, SERVICE_TURN_OFF, {"entity_id": switch_entity_id}, blocking=True
         )
+
+    assert str(err.value) == (
+        "Unable to set value 32-112-0-20: zwave_error: Z-Wave error 1 - test"
+    )