Fix test-assert

Author: bouwew

plugwise_usb/nodes/helpers/pulses.py

@@ -184,40 +184,37 @@ def collected_pulses(
         log_pulses = result[0]
         reset = result[1]
         pulses: int | None = None
-        timestamp: datetime | None = None
-        if is_consumption and self._pulses_consumption is not None:
-            timestamp = self._pulses_timestamp
-            if from_timestamp != timestamp:
-                if is_consumption and self._pulses_consumption is not None:
-                    pulses = self._pulses_consumption
-                    timestamp = self._pulses_timestamp
-                if not is_consumption and self._pulses_production is not None:
-                    pulses = self._pulses_production
-                    timestamp = self._pulses_timestamp
-
-                if pulses is None:
-                    _LOGGER.debug(
-                        "collected_pulses | %s | is_consumption=%s, pulses=None",
-                        self._mac,
-                        is_consumption,
-                    )
-                    return (None, None)
-
+        timestamp = self._pulses_timestamp
+        if from_timestamp != timestamp:
+            if is_consumption and self._pulses_consumption is not None:
+                pulses = self._pulses_consumption
+                timestamp = self._pulses_timestamp
+            if not is_consumption and self._pulses_production is not None:
+                pulses = self._pulses_production
+                timestamp = self._pulses_timestamp
+
+            if pulses is None:
                 _LOGGER.debug(
-                    "collected_pulses | pulses=%s | log_pulses=%s | consumption=%s from %s to %s",
-                    pulses,
-                    log_pulses,
+                    "collected_pulses | %s | is_consumption=%s, pulses=None",
+                    self._mac,
                     is_consumption,
-                    from_timestamp,
-                    timestamp,
                 )
+                return (None, None)
 
-                # Always return positive values of energy_statistics
-                return (abs(pulses + log_pulses), timestamp)
+            _LOGGER.debug(
+                "collected_pulses | pulses=%s | log_pulses=%s | consumption=%s from %s to %s",
+                pulses,
+                log_pulses,
+                is_consumption,
+                from_timestamp,
+                timestamp,
+            )
 
-            delta_cons_pulses: int = 0
-            delta_prod_pulses: int = 0
-            delta_cons_pulses = self._pulses_consumption - self._prev_pulses_consumption
+        delta_cons_pulses: int = 0
+        delta_prod_pulses: int = 0
+        delta_cons_pulses = self._pulses_consumption - self._prev_pulses_consumption
+        if is_consumption and self._pulses_consumption is not None:
+            timestamp = self._pulses_timestamp
             pulses = self._prev_pulses_consumption + delta_cons_pulses
             self._prev_pulses_consumption = pulses
             self._prev_timestamp = timestamp

tests/test_usb.py

@@ -1145,7 +1145,7 @@ def test_pulse_collection_consumption(
         assert tst_consumption.log_rollover
         assert tst_consumption.collected_pulses(
             fixed_this_hour, is_consumption=True
-        ) == (45+ 2222 + 3333, pulse_update_3)
+        ) == (45+ 2222 + 3333, test_timestamp)
         pulse_update_4 = fixed_this_hour + td(hours=2, seconds=10)
         tst_consumption.update_pulse_counter(321, 0, pulse_update_4)
         assert not tst_consumption.log_rollover