From f733a19f8519d962ebecaf8bbb3043d0711abfc2 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 26 Oct 2021 13:38:30 +0200
Subject: [PATCH] chore: exponential backoff for all errors not just timeouts

Signed-off-by: blam <ben@blam.sh>
---
 packages/e2e-test/src/lib/helpers.ts | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/e2e-test/src/lib/helpers.ts b/packages/e2e-test/src/lib/helpers.ts
index f326311f07..9a9c2010c9 100644
--- a/packages/e2e-test/src/lib/helpers.ts
+++ b/packages/e2e-test/src/lib/helpers.ts
@@ -131,12 +131,12 @@ export async function waitForPageWithText(
   browser: any,
   path: string,
   text: string,
-  { intervalMs = 1000, maxLoadAttempts = 50 } = {},
+  { intervalMs = 1000, maxFindAttempts = 50 } = {},
 ) {
-  let loadAttempts = 0;
+  let findAttempts = 0;
   for (;;) {
     try {
-      const waitTimeMs = intervalMs * (Math.log10(loadAttempts + 1) + 1);
+      const waitTimeMs = intervalMs * (Math.log10(findAttempts + 1) + 1);
       console.log(`Attempting to load page at ${path}, waiting ${waitTimeMs}`);
       await new Promise(resolve => setTimeout(resolve, waitTimeMs));
       await browser.visit(path);
@@ -150,15 +150,12 @@ export async function waitForPageWithText(
       break;
     } catch (error) {
       assertError(error);
-      if (error.message.match(EXPECTED_LOAD_ERRORS)) {
-        loadAttempts++;
-        if (loadAttempts >= maxLoadAttempts) {
-          throw new Error(
-            `Failed to load page '${path}', max number of attempts reached`,
-          );
-        }
-      } else {
-        throw error;
+
+      findAttempts++;
+      if (findAttempts >= maxFindAttempts) {
+        throw new Error(
+          `Failed to load page '${path}', max number of attempts reached`,
+        );
       }
     }
   }