Skip to content

Commit 216381d

Browse files
committed
Add/update collected_pulses asserts for pulse-counter reset
1 parent 9f2ed2f commit 216381d

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

tests/test_usb.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,14 +1124,19 @@ def test_pulse_collection_consumption(
11241124
assert tst_consumption.collected_pulses(
11251125
fixed_this_hour - td(hours=24), is_consumption=True
11261126
) == (2500 + 23861, pulse_update_3)
1127-
pulse_update_4 = fixed_this_hour + td(hours=1, minutes=1, seconds=3)
1127+
pulse_update_4 = fixed_this_hour + td(hours=0, minutes=1)
11281128
tst_consumption.update_pulse_counter(45, 0, pulse_update_4)
11291129
assert tst_consumption.log_rollover
11301130
assert tst_consumption.hourly_reset_time == pulse_update_4
11311131
test_timestamp = fixed_this_hour + td(hours=1)
1132+
# Collected pulses last hour:
11321133
assert tst_consumption.collected_pulses(
1133-
test_timestamp, is_consumption=True
1134+
fixed_this_hour, is_consumption=True
11341135
) == (45, pulse_update_4)
1136+
# Collected pulses last day:
1137+
assert tst_consumption.collected_pulses(
1138+
fixed_this_hour - td(hours=24), is_consumption=True
1139+
) == (2500 + 23861, pulse_update_3)
11351140
tst_consumption.add_log(100, 2, (fixed_this_hour + td(hours=1)), 2222)
11361141
assert not tst_consumption.log_rollover
11371142
# Test collection of the last full hour

0 commit comments

Comments
 (0)