|
16 | 16 |
|
17 | 17 | from httpware import Client, NotFoundError, ServiceUnavailableError |
18 | 18 | from httpware._internal.status import STREAMING_BODY_MARKER, _is_streaming_body_sync |
19 | | -from httpware.errors import NetworkError, RetryBudgetExhaustedError, StatusError, TransportError |
| 19 | +from httpware.errors import NetworkError, RetryBudgetExhaustedError, TransportError |
20 | 20 | from httpware.errors import TimeoutError as HttpwareTimeoutError |
21 | 21 | from httpware.middleware.resilience.budget import RetryBudget |
22 | 22 | from httpware.middleware.resilience.retry import ( |
@@ -275,20 +275,18 @@ def handler(request: httpx2.Request) -> httpx2.Response: # noqa: ARG001 |
275 | 275 |
|
276 | 276 |
|
277 | 277 | def test_retry_after_seconds_honored() -> None: |
| 278 | + """When Retry-After fits within max_delay, it overrides the jittered backoff.""" |
278 | 279 | sleeper = _SleepRecorder() |
279 | | - |
280 | | - def handler(request: httpx2.Request) -> httpx2.Response: |
281 | | - return httpx2.Response( |
282 | | - HTTPStatus.TOO_MANY_REQUESTS, |
283 | | - request=request, |
284 | | - headers={"Retry-After": "1"}, |
285 | | - ) |
286 | | - |
287 | | - client = _client(handler, retry=Retry(_sleep=sleeper, base_delay=0.01, max_delay=0.5, max_attempts=2)) |
288 | | - with pytest.raises(StatusError): |
289 | | - client.get("https://example.test/x") |
290 | | - # Retry-After=1 clamped to max_delay=0.5 |
291 | | - assert sleeper.calls == [0.5] |
| 280 | + handler = _ResponseSequenceWithHeaders( |
| 281 | + [ |
| 282 | + (HTTPStatus.TOO_MANY_REQUESTS, {"Retry-After": "1"}), |
| 283 | + (HTTPStatus.OK, {}), |
| 284 | + ] |
| 285 | + ) |
| 286 | + client = _client(handler, retry=Retry(_sleep=sleeper, base_delay=0.01, max_delay=5.0, max_attempts=2)) |
| 287 | + response = client.get("https://example.test/x") |
| 288 | + assert response.status_code == HTTPStatus.OK |
| 289 | + assert sleeper.calls == [1.0] |
292 | 290 |
|
293 | 291 |
|
294 | 292 | def test_retry_after_http_date_overrides_backoff() -> None: |
@@ -504,3 +502,35 @@ def test_deposit_fires_once_per_call_not_per_attempt() -> None: |
504 | 502 | assert response.status_code == HTTPStatus.OK |
505 | 503 | assert handler.calls == 3 # noqa: PLR2004 — "3" is intentional literal in test (max_attempts=3) |
506 | 504 | assert budget.deposit_calls == 1, f"expected 1 deposit per request, got {budget.deposit_calls}" |
| 505 | + |
| 506 | + |
| 507 | +def test_retry_after_exceeding_max_delay_raises_with_note() -> None: |
| 508 | + """When Retry-After > max_delay, give up — don't silently retry after a too-short delay.""" |
| 509 | + sleeper = _SleepRecorder() |
| 510 | + handler = _ResponseSequenceWithHeaders( |
| 511 | + [ |
| 512 | + (HTTPStatus.SERVICE_UNAVAILABLE, {"Retry-After": "9999"}), |
| 513 | + (HTTPStatus.OK, {}), |
| 514 | + ] |
| 515 | + ) |
| 516 | + client = _client(handler, retry=Retry(_sleep=sleeper, base_delay=0.01, max_delay=2.5)) |
| 517 | + with pytest.raises(ServiceUnavailableError) as exc_info: |
| 518 | + client.get("https://example.test/x") |
| 519 | + notes = getattr(exc_info.value, "__notes__", []) |
| 520 | + assert any("Retry-After" in n and "exceeded max_delay" in n for n in notes) |
| 521 | + assert sleeper.calls == [] |
| 522 | + assert handler.calls == 1 |
| 523 | + |
| 524 | + |
| 525 | +def test_retry_after_equal_to_max_delay_still_retries() -> None: |
| 526 | + sleeper = _SleepRecorder() |
| 527 | + handler = _ResponseSequenceWithHeaders( |
| 528 | + [ |
| 529 | + (HTTPStatus.SERVICE_UNAVAILABLE, {"Retry-After": "2"}), |
| 530 | + (HTTPStatus.OK, {}), |
| 531 | + ] |
| 532 | + ) |
| 533 | + client = _client(handler, retry=Retry(_sleep=sleeper, base_delay=0.01, max_delay=2.0)) |
| 534 | + client.get("https://example.test/x") |
| 535 | + assert sleeper.calls == [2.0] |
| 536 | + assert handler.calls == 2 # noqa: PLR2004 — initial attempt + 1 retry |
0 commit comments