Skip to content

Commit b088f4b

Browse files
llucaxllucax
committed
fixup! Use plain floats in the resampler buffer
Rename astuple() to as_float_tuple() to make it less confusing.
1 parent be4311e commit b088f4b

File tree

1 file changed

+57
-57
lines changed

1 file changed

+57
-57
lines changed

‎tests/timeseries/test_resampling.py‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ async def source_chan() -> AsyncIterator[Broadcast[Sample[Quantity]]]:
5454
await chan.close()
5555

5656

57-
def astuple(sample: Sample[Quantity]) -> tuple[datetime, float]:
57+
def as_float_tuple(sample: Sample[Quantity]) -> tuple[datetime, float]:
5858
"""Convert a sample to a tuple of datetime and float value."""
5959
assert sample.value is not None, "Sample value should not be None"
6060
return (sample.timestamp, sample.value.base_value)
@@ -320,7 +320,7 @@ async def test_resampling_window_size_is_constant(
320320
)
321321
)
322322
resampling_fun_mock.assert_called_once_with(
323-
a_sequence(astuple(sample1s)), config, source_props
323+
a_sequence(as_float_tuple(sample1s)), config, source_props
324324
)
325325
sink_mock.reset_mock()
326326
resampling_fun_mock.reset_mock()
@@ -348,9 +348,9 @@ async def test_resampling_window_size_is_constant(
348348
)
349349
resampling_fun_mock.assert_called_once_with(
350350
a_sequence(
351-
astuple(sample2_5s),
352-
astuple(sample3s),
353-
astuple(sample4s),
351+
as_float_tuple(sample2_5s),
352+
as_float_tuple(sample3s),
353+
as_float_tuple(sample4s),
354354
),
355355
config,
356356
source_props,
@@ -420,8 +420,8 @@ async def test_timer_errors_are_logged( # pylint: disable=too-many-statements
420420
)
421421
resampling_fun_mock.assert_called_once_with(
422422
a_sequence(
423-
astuple(sample0s),
424-
astuple(sample1s),
423+
as_float_tuple(sample0s),
424+
as_float_tuple(sample1s),
425425
),
426426
config,
427427
source_props,
@@ -459,10 +459,10 @@ async def test_timer_errors_are_logged( # pylint: disable=too-many-statements
459459
)
460460
resampling_fun_mock.assert_called_once_with(
461461
a_sequence(
462-
astuple(sample1s),
463-
astuple(sample2_5s),
464-
astuple(sample3s),
465-
astuple(sample4s),
462+
as_float_tuple(sample1s),
463+
as_float_tuple(sample2_5s),
464+
as_float_tuple(sample3s),
465+
as_float_tuple(sample4s),
466466
),
467467
config,
468468
source_props,
@@ -498,11 +498,11 @@ async def test_timer_errors_are_logged( # pylint: disable=too-many-statements
498498
)
499499
resampling_fun_mock.assert_called_once_with(
500500
a_sequence(
501-
astuple(sample3s),
502-
astuple(sample4s),
503-
astuple(sample4_5s),
504-
astuple(sample5s),
505-
astuple(sample6s),
501+
as_float_tuple(sample3s),
502+
as_float_tuple(sample4s),
503+
as_float_tuple(sample4_5s),
504+
as_float_tuple(sample5s),
505+
as_float_tuple(sample6s),
506506
),
507507
config,
508508
source_props,
@@ -575,8 +575,8 @@ async def test_future_samples_not_included(
575575
)
576576
resampling_fun_mock.assert_called_once_with(
577577
a_sequence(
578-
astuple(sample0s),
579-
astuple(sample1s),
578+
as_float_tuple(sample0s),
579+
as_float_tuple(sample1s),
580580
),
581581
config,
582582
source_props, # sample2_1s is not here
@@ -605,9 +605,9 @@ async def test_future_samples_not_included(
605605
)
606606
resampling_fun_mock.assert_called_once_with(
607607
a_sequence(
608-
astuple(sample1s),
609-
astuple(sample2_1s),
610-
astuple(sample3s),
608+
as_float_tuple(sample1s),
609+
as_float_tuple(sample2_1s),
610+
as_float_tuple(sample3s),
611611
),
612612
config,
613613
source_props, # sample4_1s is not here
@@ -667,7 +667,7 @@ async def test_resampling_with_one_window(
667667
)
668668
resampling_fun_mock.assert_called_once_with(
669669
a_sequence(
670-
astuple(sample1s),
670+
as_float_tuple(sample1s),
671671
),
672672
config,
673673
source_props,
@@ -698,9 +698,9 @@ async def test_resampling_with_one_window(
698698
)
699699
resampling_fun_mock.assert_called_once_with(
700700
a_sequence(
701-
astuple(sample2_5s),
702-
astuple(sample3s),
703-
astuple(sample4s),
701+
as_float_tuple(sample2_5s),
702+
as_float_tuple(sample3s),
703+
as_float_tuple(sample4s),
704704
),
705705
config,
706706
source_props,
@@ -791,8 +791,8 @@ async def test_resampling_with_one_and_a_half_windows( # pylint: disable=too-ma
791791
)
792792
resampling_fun_mock.assert_called_once_with(
793793
a_sequence(
794-
astuple(sample0s),
795-
astuple(sample1s),
794+
as_float_tuple(sample0s),
795+
as_float_tuple(sample1s),
796796
),
797797
config,
798798
source_props,
@@ -824,9 +824,9 @@ async def test_resampling_with_one_and_a_half_windows( # pylint: disable=too-ma
824824
# It should include samples in the interval (1, 4] seconds
825825
resampling_fun_mock.assert_called_once_with(
826826
a_sequence(
827-
astuple(sample2_5s),
828-
astuple(sample3s),
829-
astuple(sample4s),
827+
as_float_tuple(sample2_5s),
828+
as_float_tuple(sample3s),
829+
as_float_tuple(sample4s),
830830
),
831831
config,
832832
source_props,
@@ -856,9 +856,9 @@ async def test_resampling_with_one_and_a_half_windows( # pylint: disable=too-ma
856856
# It should include samples in the interval (3, 6] seconds
857857
resampling_fun_mock.assert_called_once_with(
858858
a_sequence(
859-
astuple(sample4s),
860-
astuple(sample5s),
861-
astuple(sample6s),
859+
as_float_tuple(sample4s),
860+
as_float_tuple(sample5s),
861+
as_float_tuple(sample6s),
862862
),
863863
config,
864864
source_props,
@@ -890,7 +890,7 @@ async def test_resampling_with_one_and_a_half_windows( # pylint: disable=too-ma
890890
)
891891
# It should include samples in the interval (5, 8] seconds
892892
resampling_fun_mock.assert_called_once_with(
893-
a_sequence(astuple(sample6s)),
893+
a_sequence(as_float_tuple(sample6s)),
894894
config,
895895
source_props,
896896
)
@@ -970,8 +970,8 @@ async def test_resampling_with_two_windows( # pylint: disable=too-many-statemen
970970
)
971971
resampling_fun_mock.assert_called_once_with(
972972
a_sequence(
973-
astuple(sample0s),
974-
astuple(sample1s),
973+
as_float_tuple(sample0s),
974+
as_float_tuple(sample1s),
975975
),
976976
config,
977977
source_props,
@@ -1003,10 +1003,10 @@ async def test_resampling_with_two_windows( # pylint: disable=too-many-statemen
10031003
# It should include samples in the interval (0, 4] seconds
10041004
resampling_fun_mock.assert_called_once_with(
10051005
a_sequence(
1006-
astuple(sample1s),
1007-
astuple(sample2_5s),
1008-
astuple(sample3s),
1009-
astuple(sample4s),
1006+
as_float_tuple(sample1s),
1007+
as_float_tuple(sample2_5s),
1008+
as_float_tuple(sample3s),
1009+
as_float_tuple(sample4s),
10101010
),
10111011
config,
10121012
source_props,
@@ -1036,11 +1036,11 @@ async def test_resampling_with_two_windows( # pylint: disable=too-many-statemen
10361036
# It should include samples in the interval (2, 6] seconds
10371037
resampling_fun_mock.assert_called_once_with(
10381038
a_sequence(
1039-
astuple(sample2_5s),
1040-
astuple(sample3s),
1041-
astuple(sample4s),
1042-
astuple(sample5s),
1043-
astuple(sample6s),
1039+
as_float_tuple(sample2_5s),
1040+
as_float_tuple(sample3s),
1041+
as_float_tuple(sample4s),
1042+
as_float_tuple(sample5s),
1043+
as_float_tuple(sample6s),
10441044
),
10451045
config,
10461046
source_props,
@@ -1066,8 +1066,8 @@ async def test_resampling_with_two_windows( # pylint: disable=too-many-statemen
10661066
# It should include samples in the interval (4, 8] seconds
10671067
resampling_fun_mock.assert_called_once_with(
10681068
a_sequence(
1069-
astuple(sample5s),
1070-
astuple(sample6s),
1069+
as_float_tuple(sample5s),
1070+
as_float_tuple(sample6s),
10711071
),
10721072
config,
10731073
source_props,
@@ -1135,7 +1135,7 @@ async def test_receiving_stopped_resampling_error(
11351135
)
11361136
)
11371137
resampling_fun_mock.assert_called_once_with(
1138-
a_sequence(astuple(sample0s)), config, source_props
1138+
a_sequence(as_float_tuple(sample0s)), config, source_props
11391139
)
11401140
sink_mock.reset_mock()
11411141
resampling_fun_mock.reset_mock()
@@ -1271,11 +1271,11 @@ async def test_timer_is_aligned(
12711271
)
12721272
resampling_fun_mock.assert_called_once_with(
12731273
a_sequence(
1274-
astuple(sample1s),
1275-
astuple(sample1_5s),
1276-
astuple(sample2_5s),
1277-
astuple(sample3s),
1278-
astuple(sample4s),
1274+
as_float_tuple(sample1s),
1275+
as_float_tuple(sample1_5s),
1276+
as_float_tuple(sample2_5s),
1277+
as_float_tuple(sample3s),
1278+
as_float_tuple(sample4s),
12791279
),
12801280
config,
12811281
source_props,
@@ -1342,7 +1342,7 @@ async def test_resampling_all_zeros(
13421342
)
13431343
)
13441344
resampling_fun_mock.assert_called_once_with(
1345-
a_sequence(astuple(sample1s)), config, source_props
1345+
a_sequence(as_float_tuple(sample1s)), config, source_props
13461346
)
13471347
assert source_props == SourceProperties(
13481348
sampling_start=timestamp, received_samples=2, sampling_period=None
@@ -1370,9 +1370,9 @@ async def test_resampling_all_zeros(
13701370
)
13711371
resampling_fun_mock.assert_called_once_with(
13721372
a_sequence(
1373-
astuple(sample2_5s),
1374-
astuple(sample3s),
1375-
astuple(sample4s),
1373+
as_float_tuple(sample2_5s),
1374+
as_float_tuple(sample3s),
1375+
as_float_tuple(sample4s),
13761376
),
13771377
config,
13781378
source_props,

0 commit comments

Comments
 (0)