Remove Timer.periodic() and Timer.timeout() from tests

Signed-off-by: Leandro Lucarella <[email protected]>

Author: llucax

tests/test_file_watcher_integration.py

@@ -11,7 +11,7 @@
 
 from frequenz.channels import select, selected_from
 from frequenz.channels.file_watcher import Event, EventType, FileWatcher
-from frequenz.channels.timer import Timer
+from frequenz.channels.timer import SkipMissedAndDrift, Timer
 
 
 @pytest.mark.integration
@@ -27,7 +27,7 @@ async def test_file_watcher(tmp_path: pathlib.Path) -> None:
     expected_number_of_writes = 3
 
     file_watcher = FileWatcher(paths=[str(tmp_path)])
-    timer = Timer.timeout(timedelta(seconds=0.1))
+    timer = Timer(timedelta(seconds=0.1), SkipMissedAndDrift())
 
     async for selected in select(file_watcher, timer):
         if selected_from(selected, timer):
@@ -55,8 +55,8 @@ async def test_file_watcher_deletes(tmp_path: pathlib.Path) -> None:
     """
     filename = tmp_path / "test-file"
     file_watcher = FileWatcher(paths=[str(tmp_path)], event_types={EventType.DELETE})
-    write_timer = Timer.timeout(timedelta(seconds=0.1))
-    deletion_timer = Timer.timeout(timedelta(seconds=0.25))
+    write_timer = Timer(timedelta(seconds=0.1), SkipMissedAndDrift())
+    deletion_timer = Timer(timedelta(seconds=0.25), SkipMissedAndDrift())
 
     number_of_write = 0
     number_of_deletes = 0

tests/test_timer.py

@@ -266,53 +266,15 @@ async def test_timer_construction_custom_args() -> None:
     assert timer.is_running is True
 
 
-async def test_timer_construction_timeout_custom_args() -> None:
-    """Test the construction of a timeout timer with custom arguments."""
-    timer = Timer.timeout(
-        timedelta(seconds=5.0),
-        auto_start=True,
-        loop=None,
-    )
-    assert timer.interval == timedelta(seconds=5.0)
-    assert isinstance(timer.missed_tick_policy, SkipMissedAndDrift)
-    assert timer.missed_tick_policy.delay_tolerance == timedelta(0)
-    assert timer.loop is asyncio.get_running_loop()
-    assert timer.is_running is True
-
-
-async def test_timer_construction_periodic_defaults() -> None:
-    """Test the construction of a periodic timer."""
-    timer = Timer.periodic(timedelta(seconds=5.0))
-    assert timer.interval == timedelta(seconds=5.0)
-    assert isinstance(timer.missed_tick_policy, TriggerAllMissed)
-    assert timer.loop is asyncio.get_running_loop()
-    assert timer.is_running is True
-
-
-async def test_timer_construction_periodic_custom_args() -> None:
-    """Test the construction of a timeout timer with custom arguments."""
-    timer = Timer.periodic(
-        timedelta(seconds=5.0),
-        skip_missed_ticks=True,
-        auto_start=True,
-        start_delay=timedelta(seconds=1.0),
-        loop=None,
-    )
-    assert timer.interval == timedelta(seconds=5.0)
-    assert isinstance(timer.missed_tick_policy, SkipMissedAndResync)
-    assert timer.loop is asyncio.get_running_loop()
-    assert timer.is_running is True
-
-
 async def test_timer_construction_wrong_args() -> None:
-    """Test the construction of a timeout timer with wrong arguments."""
+    """Test the construction of a timer with wrong arguments."""
     with pytest.raises(
         ValueError,
         match="^The `interval` must be positive and at least 1 microsecond, not -1 day, 23:59:55$",
     ):
-        _ = Timer.periodic(
+        _ = Timer(
             timedelta(seconds=-5.0),
-            skip_missed_ticks=True,
+            SkipMissedAndResync(),
             auto_start=True,
             loop=None,
         )
@@ -321,9 +283,9 @@ async def test_timer_construction_wrong_args() -> None:
         ValueError,
         match="^`start_delay` can't be negative, got -1 day, 23:59:59$",
     ):
-        _ = Timer.periodic(
+        _ = Timer(
             timedelta(seconds=5.0),
-            skip_missed_ticks=True,
+            SkipMissedAndResync(),
             auto_start=True,
             start_delay=timedelta(seconds=-1.0),
             loop=None,
@@ -333,9 +295,9 @@ async def test_timer_construction_wrong_args() -> None:
         ValueError,
         match="^`auto_start` must be `True` if a `start_delay` is specified$",
     ):
-        _ = Timer.periodic(
+        _ = Timer(
             timedelta(seconds=5.0),
-            skip_missed_ticks=True,
+            SkipMissedAndResync(),
             auto_start=False,
             start_delay=timedelta(seconds=1.0),
             loop=None,

tests/test_timer_integration.py

@@ -10,7 +10,7 @@
 import async_solipsism
 import pytest
 
-from frequenz.channels.timer import Timer
+from frequenz.channels.timer import SkipMissedAndDrift, Timer
 
 
 @pytest.mark.integration
@@ -24,7 +24,7 @@ async def timer_wait(timer: Timer) -> None:
 
     async with asyncio.timeout(2.0):
         async with asyncio.TaskGroup() as task_group:
-            timer = Timer.timeout(timedelta(seconds=1.0))
+            timer = Timer(timedelta(seconds=1.0), SkipMissedAndDrift())
             start_time = event_loop.time()
             task_group.create_task(timer_wait(timer))
             await asyncio.sleep(0.5)