Update tests

Author: Pijukatel

src/apify/_actor.py

@@ -734,7 +734,7 @@ async def start(
             serialized_webhooks = None
 
         if timeout == 'RemainingTime':
-            actor_start_timeout = await self._get_remaining_time()
+            actor_start_timeout = self._get_remaining_time()
         elif isinstance(timeout, str):
             raise ValueError(
                 f'`timeout` can be `None`, `RemainingTime` literal or `timedelta` instance, but is {timeout=}'
@@ -754,7 +754,7 @@ async def start(
 
         return ActorRun.model_validate(api_result)
 
-    async def _get_remaining_time(self) -> timedelta | None:
+    def _get_remaining_time(self) -> timedelta | None:
         """Get time remaining from the actor timeout. Returns `None` if not on an Apify platform."""
         if self.is_at_home() and self.configuration.timeout_at:
             return self.configuration.timeout_at - datetime.now(tz=timezone.utc)
@@ -846,7 +846,7 @@ async def call(
             serialized_webhooks = None
 
         if timeout == 'RemainingTime':
-            actor_call_timeout = await self._get_remaining_time()
+            actor_call_timeout = self._get_remaining_time()
         elif isinstance(timeout, str):
             raise ValueError(
                 f'`timeout` can be `None`, `RemainingTime` literal or `timedelta` instance, but is {timeout=}'

tests/integration/test_actor_call_timeouts.py

@@ -21,29 +21,26 @@ async def main() -> None:
             if actor_input.get('called_from_another_actor', False) is True:
                 return
 
-            await asyncio.sleep(1)
             # Start another run of this actor with timeout set to the time remaining in this actor run
-            other_run_data = await Actor.start(
+            other_run_data = await Actor.call(
                 actor_id=Actor.configuration.actor_id or '',
                 run_input={'called_from_another_actor': True},
                 timeout='RemainingTime',
             )
-
-            # To make sure that the actor is started
-            await asyncio.sleep(5)
-
-            assert Actor.configuration.timeout_at is not None
-            assert Actor.configuration.started_at is not None
             assert other_run_data is not None
-            assert other_run_data.options is not None
+            try:
+                # To make sure that the actor is started
+                await asyncio.sleep(5)
+                assert other_run_data.options is not None
+                assert Actor.configuration.timeout_at is not None
+                assert Actor.configuration.started_at is not None
 
-            remaining_time_after_actor_start = Actor.configuration.timeout_at - datetime.now(tz=timezone.utc)
+                remaining_time_after_actor_start = Actor.configuration.timeout_at - datetime.now(tz=timezone.utc)
 
-            try:
                 assert other_run_data.options.timeout > remaining_time_after_actor_start
                 assert other_run_data.options.timeout < Actor.configuration.timeout_at - Actor.configuration.started_at
             finally:
-                # Abort the other actor run after asserting the timeouts
+                # Make sure the other actor run is aborted
                 await Actor.apify_client.run(other_run_data.id).abort()
 
     actor = await make_actor(label='remaining-timeout', main_func=main)
@@ -65,28 +62,29 @@ async def main() -> None:
                 return
 
             await asyncio.sleep(1)
+
             # Start another run of this actor with timeout set to the time remaining in this actor run
             other_run_data = await Actor.call(
                 actor_id=Actor.configuration.actor_id or '',
                 run_input={'called_from_another_actor': True},
                 timeout='RemainingTime',
             )
 
-            # To make sure that the actor is started
-            await asyncio.sleep(5)
-
-            assert Actor.configuration.timeout_at is not None
-            assert Actor.configuration.started_at is not None
             assert other_run_data is not None
-            assert other_run_data.options is not None
+            try:
+                # To make sure that the actor is started
+                await asyncio.sleep(5)
 
-            remaining_time_after_actor_start = Actor.configuration.timeout_at - datetime.now(tz=timezone.utc)
+                assert other_run_data.options is not None
+                assert Actor.configuration.timeout_at is not None
+                assert Actor.configuration.started_at is not None
+
+                remaining_time_after_actor_start = Actor.configuration.timeout_at - datetime.now(tz=timezone.utc)
 
-            try:
                 assert other_run_data.options.timeout > remaining_time_after_actor_start
                 assert other_run_data.options.timeout < Actor.configuration.timeout_at - Actor.configuration.started_at
             finally:
-                # Abort the other actor run after asserting the timeouts
+                # Make sure the other actor run is aborted
                 await Actor.apify_client.run(other_run_data.id).abort()
 
     actor = await make_actor(label='remaining-timeout', main_func=main)