Use tries on all API calls

internet2 · May 10, 2020 · c8d75a8 · c8d75a8
1 parent a8b6132
commit c8d75a8
Show file tree

Hide file tree

Showing 4 changed files with 214 additions and 132 deletions.
diff --git a/__tests__/cacheHttpsClient.test.ts b/__tests__/cacheHttpsClient.test.ts
@@ -59,20 +59,17 @@ function handleResponse(
 
 async function testRetryExpectingResult(
     responses: Array<TestResponse>,
-    expectedResult: string
+    expectedResult: string | null
 ): Promise<void> {
     responses = responses.reverse(); // Reverse responses since we pop from end
 
     const actualResult = await retry(
         "test",
         () => handleResponse(responses.pop()),
-        (response: TestResponse) => response.statusCode,
-        (response: TestResponse) => response.result,
-        (statusCode: number) => statusCode === 200,
-        (statusCode: number) => statusCode === 503
+        (response: TestResponse) => response.statusCode
     );
 
-    expect(actualResult).toEqual(expectedResult);
+    expect(actualResult.result).toEqual(expectedResult);
 }
 
 async function testRetryExpectingError(
@@ -84,10 +81,7 @@ async function testRetryExpectingError(
         retry(
             "test",
             () => handleResponse(responses.pop()),
-            (response: TestResponse) => response.statusCode,
-            (response: TestResponse) => response.result,
-            (statusCode: number) => statusCode === 200,
-            (statusCode: number) => statusCode === 503
+            (response: TestResponse) => response.statusCode
         )
     ).rejects.toBeInstanceOf(Error);
 }
@@ -165,3 +159,19 @@ test("retry works after error", async () => {
         "Ok"
     );
 });
+
+test("retry returns after client error", async () => {
+    await testRetryExpectingResult(
+        [
+            {
+                statusCode: 400,
+                result: null
+            },
+            {
+                statusCode: 200,
+                result: "Ok"
+            }
+        ],
+        null
+    );
+});