Working on trying to recreate issue #36 in testing.

caseyamcl · Apr 8, 2024 · cb89c79 · cb89c79
1 parent cbec4ce
commit cb89c79
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/GuzzleRetryMiddleware.php b/src/GuzzleRetryMiddleware.php
@@ -231,6 +231,7 @@ protected function onRejected(RequestInterface $request, array $options): callab
      * Decide whether to retry on connect exception
      *
      * @param array<string,mixed> $options
+     * @param RequestInterface $request
      * @return bool
      */
     protected function shouldRetryConnectException(array $options, RequestInterface $request): bool

diff --git a/tests/GuzzleRetryMiddlewareTest.php b/tests/GuzzleRetryMiddlewareTest.php
@@ -747,7 +747,27 @@ public function testGiveUpAfterSecsFailsWhenTimeLimitExceeded(): void
         $responses = [
             new Response(429, [], 'Wait 1'),
             new Response(429, [], 'Wait 2'),
-            new Response(429, [], 'Wait 3'),
+            new Response(503, [], 'Wait 3'),
+            new Response(429, [], 'Wait 4'),
+            new Response(200, [], 'Good')
+        ];
+
+        $stack = HandlerStack::create(new MockHandler($responses));
+        $stack->push(GuzzleRetryMiddleware::factory([
+            'default_retry_multiplier' => 1.5,
+            'give_up_after_secs' => 1
+        ]));
+
+        $client = new Client(['handler' => $stack]);
+        $client->request('GET', '/');
+    }
+
+    public function testGiveUpAfterSecsWithLongerTimes(): void
+    {
+        $responses = [
+            new Response(429, [], 'Wait 1'),
+            new Response(429, [], 'Wait 2'),
+            new Response(503, [], 'Wait 3'),
             new Response(429, [], 'Wait 4'),
             new Response(200, [], 'Good')
         ];