Move rollover assert to after collected_pulses()

Author: bouwew

tests/test_usb.py

@@ -1081,8 +1081,8 @@ def test_pulse_collection_consumption(
         assert tst_consumption.collected_pulses(
             test_timestamp, is_consumption=False
         ) == (None, None)
-
         assert not tst_consumption.log_rollover
+
         # add missing logs
         test_timestamp = fixed_this_hour - td(hours=3)
         tst_consumption.add_log(99, 2, (fixed_this_hour - td(hours=3)), 1000)
@@ -1113,32 +1113,32 @@ def test_pulse_collection_consumption(
         assert not tst_consumption.log_rollover
         pulse_update_3 = fixed_this_hour + td(hours=1, seconds=3)
         tst_consumption.update_pulse_counter(45, 0, pulse_update_3)
-        assert tst_consumption.log_rollover
         test_timestamp = fixed_this_hour + td(hours=1, seconds=5)
         assert tst_consumption.collected_pulses(
             test_timestamp, is_consumption=True
         ) == (None, None)
+        assert tst_consumption.log_rollover
         tst_consumption.add_log(100, 2, (fixed_this_hour + td(hours=1)), 2222)
-        assert not tst_consumption.log_rollover
         assert tst_consumption.collected_pulses(
             test_timestamp, is_consumption=True
         ) == (45, pulse_update_3)
         assert tst_consumption.collected_pulses(
             fixed_this_hour, is_consumption=True
         ) == (45 + 2222, pulse_update_3)
+        assert not tst_consumption.log_rollover
 
         # 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
         ) == (None, None)
+        assert tst_consumption.log_rollover
         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
         assert tst_consumption.collected_pulses(
             fixed_this_hour, is_consumption=True
         ) == (2222 + 3333 + 321, pulse_update_4)
+        assert not tst_consumption.log_rollover
 
     @freeze_time(dt.now())
     def test_pulse_collection_consumption_empty(