Use ResampleConfig2 in other tests

llucax · llucax · commit 0e1356819074 · 2025-08-28T11:12:12.000+02:00
In tests where there are no behavior differences between using the old
monotonic timer and the new wall clock timer, we just use the wall clock
timer, as we plan to deprecate the other timer soon.

Signed-off-by: Leandro Lucarella &lt;luca-frequenz@llucax.com&gt;
diff --git a/tests/actor/test_resampling.py b/tests/actor/test_resampling.py
@@ -17,7 +17,7 @@
 from frequenz.sdk._internal._channels import ChannelRegistry
 from frequenz.sdk.microgrid._data_sourcing import ComponentMetricRequest
 from frequenz.sdk.microgrid._resampling import ComponentMetricsResamplingActor
-from frequenz.sdk.timeseries import ResamplerConfig, Sample
+from frequenz.sdk.timeseries import ResamplerConfig2, Sample
 
 
 @pytest.fixture(autouse=True)
@@ -113,7 +113,7 @@ async def test_single_request(
         channel_registry=channel_registry,
         data_sourcing_request_sender=data_source_req_chan.new_sender(),
         resampling_request_receiver=resampling_req_chan.new_receiver(),
-        config=ResamplerConfig(
+        config=ResamplerConfig2(
             resampling_period=timedelta(seconds=0.2),
             max_data_age_in_periods=2,
         ),
@@ -156,7 +156,7 @@ async def test_duplicate_request(
         channel_registry=channel_registry,
         data_sourcing_request_sender=data_source_req_chan.new_sender(),
         resampling_request_receiver=resampling_req_chan.new_receiver(),
-        config=ResamplerConfig(
+        config=ResamplerConfig2(
             resampling_period=timedelta(seconds=0.2),
             max_data_age_in_periods=2,
         ),
diff --git a/tests/microgrid/fixtures.py b/tests/microgrid/fixtures.py
@@ -18,7 +18,7 @@
 from frequenz.sdk import microgrid
 from frequenz.sdk.microgrid._power_distributing import ComponentPoolStatus
 from frequenz.sdk.microgrid.component_graph import _MicrogridComponentGraph
-from frequenz.sdk.timeseries import ResamplerConfig
+from frequenz.sdk.timeseries import ResamplerConfig2
 
 from ..timeseries.mock_microgrid import MockMicrogrid
 from ..utils.component_data_streamer import MockComponentDataStreamer
@@ -55,7 +55,7 @@ async def new(
         if microgrid._data_pipeline._DATA_PIPELINE is not None:
             microgrid._data_pipeline._DATA_PIPELINE = None
         await microgrid._data_pipeline.initialize(
-            ResamplerConfig(resampling_period=timedelta(seconds=0.1))
+            ResamplerConfig2(resampling_period=timedelta(seconds=0.1))
         )
         streamer = MockComponentDataStreamer(mockgrid.mock_client)
 
diff --git a/tests/microgrid/test_datapipeline.py b/tests/microgrid/test_datapipeline.py
@@ -19,7 +19,7 @@
 from pytest_mock import MockerFixture
 
 from frequenz.sdk.microgrid._data_pipeline import _DataPipeline
-from frequenz.sdk.timeseries import ResamplerConfig
+from frequenz.sdk.timeseries import ResamplerConfig2
 
 from ..utils.mock_microgrid_client import MockMicrogridClient
 
@@ -36,7 +36,7 @@ async def test_actors_started(
 ) -> None:
     """Test that the datasourcing, resampling and power distributing actors are started."""
     datapipeline = _DataPipeline(
-        resampler_config=ResamplerConfig(resampling_period=timedelta(seconds=1))
+        resampler_config=ResamplerConfig2(resampling_period=timedelta(seconds=1))
     )
     await asyncio.sleep(1)
 
diff --git a/tests/timeseries/_battery_pool/test_battery_pool.py b/tests/timeseries/_battery_pool/test_battery_pool.py
@@ -34,7 +34,7 @@
 from frequenz.sdk.microgrid._power_distributing._component_managers._battery_manager import (
     _get_battery_inverter_mappings,
 )
-from frequenz.sdk.timeseries import Bounds, ResamplerConfig, Sample
+from frequenz.sdk.timeseries import Bounds, ResamplerConfig2, Sample
 from frequenz.sdk.timeseries._base_types import SystemBounds
 from frequenz.sdk.timeseries.battery_pool import BatteryPool
 from frequenz.sdk.timeseries.formula_engine._formula_generators._formula_generator import (
@@ -138,7 +138,7 @@ async def setup_all_batteries(mocker: MockerFixture) -> AsyncIterator[SetupArgs]
     # pylint: disable=protected-access
     microgrid._data_pipeline._DATA_PIPELINE = None
     await microgrid._data_pipeline.initialize(
-        ResamplerConfig(resampling_period=timedelta(seconds=min_update_interval))
+        ResamplerConfig2(resampling_period=timedelta(seconds=min_update_interval))
     )
     streamer = MockComponentDataStreamer(mock_microgrid)
 
@@ -191,7 +191,7 @@ async def setup_batteries_pool(mocker: MockerFixture) -> AsyncIterator[SetupArgs
     # pylint: disable=protected-access
     microgrid._data_pipeline._DATA_PIPELINE = None
     await microgrid._data_pipeline.initialize(
-        ResamplerConfig(resampling_period=timedelta(seconds=min_update_interval))
+        ResamplerConfig2(resampling_period=timedelta(seconds=min_update_interval))
     )
 
     # We don't use status channel from the sdk interface to limit
diff --git a/tests/timeseries/_battery_pool/test_battery_pool_control_methods.py b/tests/timeseries/_battery_pool/test_battery_pool_control_methods.py
@@ -21,7 +21,7 @@
 from frequenz.sdk.microgrid._power_distributing._component_pool_status_tracker import (
     ComponentPoolStatusTracker,
 )
-from frequenz.sdk.timeseries import ResamplerConfig
+from frequenz.sdk.timeseries import ResamplerConfig2
 from frequenz.sdk.timeseries.battery_pool.messages import BatteryPoolReport
 
 from ...utils.component_data_streamer import MockComponentDataStreamer
@@ -64,7 +64,7 @@ async def mocks(mocker: MockerFixture) -> typing.AsyncIterator[Mocks]:
     if microgrid._data_pipeline._DATA_PIPELINE is not None:
         microgrid._data_pipeline._DATA_PIPELINE = None
     await microgrid._data_pipeline.initialize(
-        ResamplerConfig(resampling_period=timedelta(seconds=0.1))
+        ResamplerConfig2(resampling_period=timedelta(seconds=0.1))
     )
     streamer = MockComponentDataStreamer(mockgrid.mock_client)
 
diff --git a/tests/timeseries/_ev_charger_pool/test_ev_charger_pool_control_methods.py b/tests/timeseries/_ev_charger_pool/test_ev_charger_pool_control_methods.py
@@ -23,7 +23,7 @@
 from frequenz.sdk.microgrid._power_distributing._component_pool_status_tracker import (
     ComponentPoolStatusTracker,
 )
-from frequenz.sdk.timeseries import ResamplerConfig, Sample3Phase
+from frequenz.sdk.timeseries import ResamplerConfig2, Sample3Phase
 from frequenz.sdk.timeseries.ev_charger_pool import EVChargerPoolReport
 
 from ...microgrid.fixtures import _Mocks
@@ -51,7 +51,7 @@ async def mocks(mocker: MockerFixture) -> typing.AsyncIterator[_Mocks]:
     if microgrid._data_pipeline._DATA_PIPELINE is not None:
         microgrid._data_pipeline._DATA_PIPELINE = None
     await microgrid._data_pipeline.initialize(
-        ResamplerConfig(resampling_period=timedelta(seconds=0.1))
+        ResamplerConfig2(resampling_period=timedelta(seconds=0.1))
     )
     streamer = MockComponentDataStreamer(mockgrid.mock_client)
 
diff --git a/tests/timeseries/_pv_pool/test_pv_pool_control_methods.py b/tests/timeseries/_pv_pool/test_pv_pool_control_methods.py
@@ -19,7 +19,7 @@
 from frequenz.sdk import microgrid
 from frequenz.sdk.microgrid import _power_distributing
 from frequenz.sdk.microgrid._data_pipeline import _DataPipeline
-from frequenz.sdk.timeseries import ResamplerConfig
+from frequenz.sdk.timeseries import ResamplerConfig2
 from frequenz.sdk.timeseries.pv_pool import PVPoolReport
 
 from ...microgrid.fixtures import _Mocks
@@ -45,7 +45,7 @@ async def mocks(mocker: MockerFixture) -> typing.AsyncIterator[_Mocks]:
     if microgrid._data_pipeline._DATA_PIPELINE is not None:
         microgrid._data_pipeline._DATA_PIPELINE = None
     await microgrid._data_pipeline.initialize(
-        ResamplerConfig(resampling_period=timedelta(seconds=0.1))
+        ResamplerConfig2(resampling_period=timedelta(seconds=0.1))
     )
     streamer = MockComponentDataStreamer(mockgrid.mock_client)
 
diff --git a/tests/timeseries/mock_microgrid.py b/tests/timeseries/mock_microgrid.py
@@ -29,7 +29,7 @@
 from frequenz.sdk._internal._asyncio import cancel_and_await
 from frequenz.sdk.microgrid import _data_pipeline
 from frequenz.sdk.microgrid.component_graph import _MicrogridComponentGraph
-from frequenz.sdk.timeseries import ResamplerConfig
+from frequenz.sdk.timeseries import ResamplerConfig2
 
 from ..utils import MockMicrogridClient
 from ..utils.component_data_wrapper import (
@@ -205,7 +205,7 @@ async def start(self, mocker: MockerFixture | None = None) -> None:
         self.init_mock_client(lambda mock_client: mock_client.initialize(local_mocker))
         self.mock_resampler = MockResampler(
             mocker,
-            ResamplerConfig(timedelta(seconds=self._sample_rate_s)),
+            ResamplerConfig2(timedelta(seconds=self._sample_rate_s)),
             bat_inverter_ids=self.battery_inverter_ids,
             pv_inverter_ids=self.pv_inverter_ids,
             evc_ids=self.evc_ids,
diff --git a/tests/timeseries/mock_resampler.py b/tests/timeseries/mock_resampler.py
@@ -17,7 +17,7 @@
 from frequenz.sdk._internal._asyncio import cancel_and_await
 from frequenz.sdk.microgrid._data_pipeline import _DataPipeline
 from frequenz.sdk.microgrid._data_sourcing import ComponentMetricRequest
-from frequenz.sdk.timeseries import ResamplerConfig, Sample
+from frequenz.sdk.timeseries import ResamplerConfig2, Sample
 from frequenz.sdk.timeseries.formula_engine._formula_generators._formula_generator import (
     NON_EXISTING_COMPONENT_ID,
 )
@@ -31,7 +31,7 @@ class MockResampler:
     def __init__(  # pylint: disable=too-many-arguments,too-many-positional-arguments
         self,
         mocker: MockerFixture,
-        resampler_config: ResamplerConfig,
+        resampler_config: ResamplerConfig2,
         bat_inverter_ids: list[ComponentId],
         pv_inverter_ids: list[ComponentId],
         evc_ids: list[ComponentId],
