From 126b5c7154223da5f0537c90462a49e7e0d3ad97 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Wed, 5 Jun 2024 12:15:45 -0400
Subject: [PATCH] chore(revert): Revert "chore: move retry async check to wrap
 time (#649)" (#667)

This reverts commit ac098a747a6ee09d70479ae5b73479172ad6cd78.
---
 google/api_core/retry/retry_unary.py |  7 ++++---
 tests/unit/retry/test_retry_unary.py | 16 +++++-----------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/google/api_core/retry/retry_unary.py b/google/api_core/retry/retry_unary.py
index 09043133..ab1b4030 100644
--- a/google/api_core/retry/retry_unary.py
+++ b/google/api_core/retry/retry_unary.py
@@ -141,7 +141,10 @@ def retry_target(
 
     for sleep in sleep_generator:
         try:
-            return target()
+            result = target()
+            if inspect.isawaitable(result):
+                warnings.warn(_ASYNC_RETRY_WARNING)
+            return result
 
         # pylint: disable=broad-except
         # This function explicitly must deal with broad exceptions.
@@ -277,8 +280,6 @@ def __call__(
             Callable: A callable that will invoke ``func`` with retry
                 behavior.
         """
-        if inspect.iscoroutinefunction(func):
-            warnings.warn(_ASYNC_RETRY_WARNING)
         if self._on_error is not None:
             on_error = self._on_error
 
diff --git a/tests/unit/retry/test_retry_unary.py b/tests/unit/retry/test_retry_unary.py
index 71f6e246..7dcd8dd6 100644
--- a/tests/unit/retry/test_retry_unary.py
+++ b/tests/unit/retry/test_retry_unary.py
@@ -101,20 +101,14 @@ def test_retry_target_non_retryable_error(utcnow, sleep):
 )
 @pytest.mark.asyncio
 async def test_retry_target_warning_for_retry(utcnow, sleep):
-    """
-    retry.Retry should raise warning when wrapping an async function.
-    """
-
-    async def target():
-        pass  # pragma: NO COVER
-
-    retry_obj = retry.Retry()
+    predicate = retry.if_exception_type(ValueError)
+    target = mock.AsyncMock(spec=["__call__"])
 
     with pytest.warns(Warning) as exc_info:
-        # raise warning when wrapping an async function
-        retry_obj(target)
+        # Note: predicate is just a filler and doesn't affect the test
+        retry.retry_target(target, predicate, range(10), None)
 
-    assert len(exc_info) == 1
+    assert len(exc_info) == 2
     assert str(exc_info[0].message) == retry.retry_unary._ASYNC_RETRY_WARNING
     sleep.assert_not_called()