Make context retries respect config

Author: hynek

src/stamina/_core.py

@@ -105,6 +105,11 @@ def from_params(
         )
 
     def __iter__(self) -> _t.Retrying:
+        if not _CONFIG.is_active:
+            return _t.Retrying(
+                reraise=True, stop=_t.stop_after_attempt(1)
+            ).__iter__()
+
         return _t.Retrying(
             before_sleep=_make_before_sleep(
                 self._name, _CONFIG.on_retry, self._args, self._kw
@@ -115,6 +120,11 @@ def __iter__(self) -> _t.Retrying:
         ).__iter__()
 
     def __aiter__(self) -> _t.AsyncRetrying:
+        if not _CONFIG.is_active:
+            return _t.AsyncRetrying(
+                reraise=True, stop=_t.stop_after_attempt(1)
+            ).__aiter__()
+
         return _t.AsyncRetrying(
             before_sleep=_make_before_sleep(
                 self._name, _CONFIG.on_retry, self._args, self._kw
@@ -229,9 +239,6 @@ def retry_decorator(wrapped: Callable[P, T]) -> Callable[P, T]:
 
             @wraps(wrapped)
             def sync_inner(*args: P.args, **kw: P.kwargs) -> T:  # type: ignore[return]
-                if not _CONFIG.is_active:
-                    return wrapped(*args, **kw)
-
                 for attempt in retry_ctx.with_name(  # noqa: RET503
                     name, args, kw
                 ):
@@ -242,9 +249,6 @@ def sync_inner(*args: P.args, **kw: P.kwargs) -> T:  # type: ignore[return]
 
         @wraps(wrapped)
         async def async_inner(*args: P.args, **kw: P.kwargs) -> T:  # type: ignore[return]
-            if not _CONFIG.is_active:
-                return await wrapped(*args, **kw)  # type: ignore[no-any-return,misc]
-
             async for attempt in retry_ctx.with_name(  # noqa: RET503
                 name, args, kw
             ):

tests/test_async.py

@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: MIT
 
-from unittest.mock import Mock
 
 import pytest
 
@@ -80,36 +79,52 @@ async def f():
         await f()
 
 
-async def test_retry_inactive(monkeypatch):
+async def test_retry_inactive():
     """
     If inactive, don't retry.
     """
+    num_called = 0
 
     @stamina.retry(on=Exception)
     async def f():
+        nonlocal num_called
+        num_called += 1
         raise Exception("passed")
 
     stamina.set_active(False)
 
-    retrying = Mock()
-    monkeypatch.setattr(stamina._core._t, "AsyncRetrying", retrying)
-
     with pytest.raises(Exception, match="passed"):
         await f()
 
-    retrying.assert_not_called()
+    assert 1 == num_called
 
 
 async def test_retry_block():
     """
     Async retry_context blocks are retried.
     """
-    i = 0
+    num_called = 0
 
     async for attempt in stamina.retry_context(on=ValueError, wait_max=0):
         with attempt:
-            i += 1
-            if i < 2:
+            num_called += 1
+            if num_called < 2:
                 raise ValueError
 
-    assert 2 == i
+    assert 2 == num_called
+
+
+async def test_retry_blocks_can_be_disabled():
+    """
+    Async context retries respect the config.
+    """
+    stamina.set_active(False)
+    num_called = 0
+
+    with pytest.raises(Exception, match="passed"):
+        async for attempt in stamina.retry_context(on=Exception, attempts=2):
+            with attempt:
+                num_called += 1
+                raise Exception("passed")
+
+    assert 1 == num_called

tests/test_sync.py

@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: MIT
 
-from unittest.mock import Mock
 
 import pytest
 import tenacity
@@ -57,24 +56,24 @@ def f():
         f()
 
 
-def test_retry_inactive(monkeypatch):
+def test_retry_inactive():
     """
     If inactive, don't retry.
     """
+    num_called = 0
 
     @stamina.retry(on=Exception)
     def f():
+        nonlocal num_called
+        num_called += 1
         raise Exception("passed")
 
     stamina.set_active(False)
 
-    retrying = Mock()
-    monkeypatch.setattr(stamina._core._t, "Retrying", retrying)
-
     with pytest.raises(Exception, match="passed"):
         f()
 
-    retrying.assert_not_called()
+    assert 1 == num_called
 
 
 def test_retry_block():