test: reuse public maybe_await in polling helpers instead of a private duplicate

Author: vdusek

tests/integration/_utils.py

@@ -13,7 +13,7 @@
 import pytest
 
 if TYPE_CHECKING:
-    from collections.abc import Awaitable, Callable, Coroutine
+    from collections.abc import Awaitable, Callable
 
 logger = logging.getLogger(__name__)
 
@@ -96,23 +96,15 @@ def get_random_resource_name(label: str) -> str:
     return name_template.format(label, get_crypto_random_object_id(random_id_length))
 
 
-@overload
-async def maybe_await(value: Coroutine[Any, Any, T]) -> T: ...
-
-
-@overload
-async def maybe_await(value: T) -> T: ...
-
-
-async def maybe_await(value: T | Coroutine[Any, Any, T]) -> T:
-    """Await coroutines, pass through other values.
+async def maybe_await(value: Awaitable[T] | T) -> T:
+    """Await `value` if it is awaitable, otherwise return it unchanged.
 
     Enables unified test code for both sync and async clients:
         result = await maybe_await(client.datasets().list())
     """
-    if hasattr(value, '__await__'):
-        return await value  # ty: ignore[invalid-await]
-    return value
+    if inspect.isawaitable(value):
+        return await cast('Awaitable[T]', value)
+    return cast('T', value)
 
 
 async def maybe_sleep(seconds: float, *, is_async: bool) -> None:
@@ -123,16 +115,6 @@ async def maybe_sleep(seconds: float, *, is_async: bool) -> None:
         time.sleep(seconds)  # noqa: ASYNC251
 
 
-async def _maybe_await(value: Awaitable[T] | T) -> T:
-    """Await `value` if it is awaitable, otherwise return it unchanged.
-
-    Lets `call_with_exp_backoff` and `poll_until_condition` accept both sync and async callables.
-    """
-    if inspect.isawaitable(value):
-        return await cast('Awaitable[T]', value)
-    return cast('T', value)
-
-
 @overload
 async def call_with_exp_backoff(
     fn: Callable[[], Awaitable[T]],
@@ -167,7 +149,7 @@ async def call_with_exp_backoff(
 
     Unlike `poll_until_condition`, the delay between attempts grows exponentially rather than staying constant.
     """
-    result = await _maybe_await(fn())
+    result = await maybe_await(fn())
     for attempt in range(max_retries):
         if condition(result):
             return result
@@ -176,7 +158,7 @@ async def call_with_exp_backoff(
             'Condition not met for %r, retrying in %ss (attempt %d/%d).', result, delay, attempt + 1, max_retries
         )
         await asyncio.sleep(delay)
-        result = await _maybe_await(fn())
+        result = await maybe_await(fn())
     return result
 
 
@@ -214,13 +196,13 @@ async def poll_until_condition(
     `call_with_exp_backoff`, the interval between polls stays constant.
     """
     deadline = time.monotonic() + timeout
-    result = await _maybe_await(fn())
+    result = await maybe_await(fn())
     while not condition(result):
         remaining = deadline - time.monotonic()
         if remaining <= 0:
             break
         await asyncio.sleep(min(poll_interval, remaining))
-        result = await _maybe_await(fn())
+        result = await maybe_await(fn())
     return result