Use self.RESTART_DELAY instead of hard-coding Actor class' value

Signed-off-by: Christian Parpart <[email protected]>

Author: christianparpart

src/frequenz/sdk/actor/_actor.py

@@ -68,7 +68,7 @@ async def _delay_if_restart(self, iteration: int) -> None:
         # the longer the actor has been running.
         # Not just for the restart-delay but actually for the n_restarts counter as well.
         if iteration > 0:
-            delay = Actor.RESTART_DELAY.total_seconds()
+            delay = self.RESTART_DELAY.total_seconds()
             _logger.info("Actor %s: Waiting %s seconds...", self, delay)
             await asyncio.sleep(delay)
 

tests/actor/test_actor.py

@@ -195,18 +195,6 @@ async def test_basic_actor(caplog: pytest.LogCaptureFixture) -> None:
     ]
 
 
-def expected_wait_time(iterations: int) -> timedelta:
-    """Calculate the expected wait time for a given iteration.
-
-    Args:
-        iterations: The iteration to calculate the wait time for.
-
-    Returns:
-        The expected wait time in seconds.
-    """
-    return timedelta(seconds=iterations * Actor.RESTART_DELAY.total_seconds())
-
-
 @pytest.mark.parametrize("restart_limit", [0, 1, 2, 10])
 async def test_restart_on_unhandled_exception(
     restart_limit: int, caplog: pytest.LogCaptureFixture
@@ -226,7 +214,10 @@ async def test_restart_on_unhandled_exception(
 
     # NB: We're adding 1.0s to the timeout to account for the time it takes to
     # run, crash, and restart the actor.
-    async with asyncio.timeout(expected_wait_time(restart_limit).total_seconds() + 1.0):
+    expected_wait_time = timedelta(
+        seconds=restart_limit * RaiseExceptionActor.RESTART_DELAY.total_seconds() + 1.0
+    )
+    async with asyncio.timeout(expected_wait_time.total_seconds()):
         with actor_restart_limit(restart_limit):
             actor = RaiseExceptionActor(
                 channel.new_receiver(),