Enable extra tests

Author: bouwew

tests/test_usb.py

@@ -1135,32 +1135,34 @@ def test_pulse_collection_consumption(
         # Collected pulses last day:
         assert tst_consumption.collected_pulses(
             test_timestamp - td(hours=24), is_consumption=True
-        ) == (45 + 2500 + 20361, pulse_update_4)
-        # tst_consumption.add_log(100, 2, (fixed_this_hour + td(hours=1)), 2222)
-        # assert not tst_consumption.log_rollover
-        ## Test collection of the last full hour
-        # assert tst_consumption.collected_pulses(
-        #     fixed_this_hour, is_consumption=True
-        # ) == (45 + 2222, pulse_update_4)
-        # pulse_update_5 = fixed_this_hour + td(hours=1, minutes=1, seconds=18)
-        # tst_consumption.update_pulse_counter(145, 0, pulse_update_5)
-        ## Test collection of the last new hour
-        # assert tst_consumption.collected_pulses(
-        #     test_timestamp, is_consumption=True
-        # ) == (145, pulse_update_5)
+        ) == (45 + 23861, pulse_update_4)  
+        # pulse-count of 2500 is ignored, the code does not export this incorrect value
 
-        # Test log rollover by updating log first before updating pulses
-        tst_consumption.add_log(100, 3, (fixed_this_hour + td(hours=2)), 3333)
-        assert tst_consumption.log_rollover
-        assert tst_consumption.collected_pulses(
-            fixed_this_hour, is_consumption=True
-        ) == (145 + 2222 + 3333, pulse_update_5)
-        pulse_update_6 = fixed_this_hour + td(hours=2, seconds=10)
-        tst_consumption.update_pulse_counter(321, 0, pulse_update_6)
+        tst_consumption.add_log(100, 2, (fixed_this_hour + td(hours=1)), 2222)
         assert not tst_consumption.log_rollover
+        # Test collection of the last full hour
         assert tst_consumption.collected_pulses(
             fixed_this_hour, is_consumption=True
-        ) == (2222 + 3333 + 321, pulse_update_6)
+        ) == (45 + 2222, pulse_update_4)
+        pulse_update_5 = fixed_this_hour + td(hours=1, minutes=1, seconds=18)
+        tst_consumption.update_pulse_counter(145, 0, pulse_update_5)
+        # Test collection of the last new hour
+        assert tst_consumption.collected_pulses(
+            test_timestamp, is_consumption=True
+        ) == (145, pulse_update_5)
+
+        # Test log rollover by updating log first before updating pulses
+        # tst_consumption.add_log(100, 3, (fixed_this_hour + td(hours=2)), 3333)
+        # assert tst_consumption.log_rollover
+        # assert tst_consumption.collected_pulses(
+        #     fixed_this_hour, is_consumption=True
+        # ) == (145 + 2222 + 3333, pulse_update_5)
+        # pulse_update_6 = fixed_this_hour + td(hours=2, seconds=10)
+        # tst_consumption.update_pulse_counter(321, 0, pulse_update_6)
+        # assert not tst_consumption.log_rollover
+        # assert tst_consumption.collected_pulses(
+        #     fixed_this_hour, is_consumption=True
+        # ) == (2222 + 3333 + 321, pulse_update_6)
 
     @freeze_time(dt.now())
     def test_pulse_collection_consumption_empty(