From fa0915d9e6e774dd600ac92cec426da96f05d481 Mon Sep 17 00:00:00 2001
From: Rob DiCiuccio <rob.diciuccio@gmail.com>
Date: Wed, 5 May 2021 19:34:13 -0700
Subject: [PATCH] Attempt to reduce asyncEvent test flakiness (#14497)

---
 superset-frontend/src/middleware/asyncEvent.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/middleware/asyncEvent.ts b/superset-frontend/src/middleware/asyncEvent.ts
index aafd7fc6e5..28dd77ee8e 100644
--- a/superset-frontend/src/middleware/asyncEvent.ts
+++ b/superset-frontend/src/middleware/asyncEvent.ts
@@ -56,13 +56,15 @@ const RETRY_DELAY = 100;
 
 let config: AppConfig;
 let transport: string;
-let polling_delay: number;
+let pollingDelayMs: number;
+let pollingTimeoutId: number;
 let listenersByJobId: Record<string, ListenerFn>;
 let retriesByJobId: Record<string, number>;
 let lastReceivedEventId: string | null | undefined;
 
 export const init = (appConfig?: AppConfig) => {
   if (!isFeatureEnabled(FeatureFlag.GLOBAL_ASYNC_QUERIES)) return;
+  if (pollingTimeoutId) clearTimeout(pollingTimeoutId);
 
   listenersByJobId = {};
   retriesByJobId = {};
@@ -84,7 +86,7 @@ export const init = (appConfig?: AppConfig) => {
     }
   }
   transport = config.GLOBAL_ASYNC_QUERIES_TRANSPORT || TRANSPORT_POLLING;
-  polling_delay = config.GLOBAL_ASYNC_QUERIES_POLLING_DELAY || 500;
+  pollingDelayMs = config.GLOBAL_ASYNC_QUERIES_POLLING_DELAY || 500;
 
   try {
     lastReceivedEventId = localStorage.getItem(LOCALSTORAGE_KEY);
@@ -185,7 +187,7 @@ const loadEventsFromApi = async () => {
   }
 
   if (transport === TRANSPORT_POLLING) {
-    setTimeout(loadEventsFromApi, polling_delay);
+    pollingTimeoutId = window.setTimeout(loadEventsFromApi, pollingDelayMs);
   }
 };