Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit7727405

Browse files
authored
chore: Revert "chore: move retry async check to wrap time (#668)" (#743)
This reverts commit3c69867.
1 parent0d5ed37 commit7727405

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

‎google/api_core/retry/retry_unary.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,10 @@ def retry_target(
141141

142142
forsleepinsleep_generator:
143143
try:
144-
returntarget()
144+
result=target()
145+
ifinspect.isawaitable(result):
146+
warnings.warn(_ASYNC_RETRY_WARNING)
147+
returnresult
145148

146149
# pylint: disable=broad-except
147150
# This function explicitly must deal with broad exceptions.
@@ -277,8 +280,6 @@ def __call__(
277280
Callable: A callable that will invoke ``func`` with retry
278281
behavior.
279282
"""
280-
ifinspect.iscoroutinefunction(func):
281-
warnings.warn(_ASYNC_RETRY_WARNING)
282283
ifself._on_errorisnotNone:
283284
on_error=self._on_error
284285

‎tests/unit/retry/test_retry_unary.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,20 +105,14 @@ def test_retry_target_non_retryable_error(utcnow, sleep):
105105
)
106106
@pytest.mark.asyncio
107107
asyncdeftest_retry_target_warning_for_retry(utcnow,sleep):
108-
"""
109-
retry.Retry should raise warning when wrapping an async function.
110-
"""
111-
112-
asyncdeftarget():
113-
pass# pragma: NO COVER
114-
115-
retry_obj=retry.Retry()
108+
predicate=retry.if_exception_type(ValueError)
109+
target=mock.AsyncMock(spec=["__call__"])
116110

117111
withpytest.warns(Warning)asexc_info:
118-
#raise warning when wrapping an async function
119-
retry_obj(target)
112+
#Note: predicate is just a filler and doesn't affect the test
113+
retry.retry_target(target,predicate,range(10),None)
120114

121-
assertlen(exc_info)==1
115+
assertlen(exc_info)==2
122116
assertstr(exc_info[0].message)==retry.retry_unary._ASYNC_RETRY_WARNING
123117
sleep.assert_not_called()
124118

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp