Sandy4321
diff --git a/‎package-lock.json‎
Lines changed: 18 additions & 51 deletions b/‎package-lock.json‎
Lines changed: 18 additions & 51 deletions
diff --git a/‎src/client/datascience/jupyter/jupyterSession.ts‎
Lines changed: 17 additions & 17 deletions b/‎src/client/datascience/jupyter/jupyterSession.ts‎
Lines changed: 17 additions & 17 deletions
@@ -19,7 +19,7 @@ import { CancellationToken } from 'vscode-jsonrpc';
 import { Cancellation } from '../../common/cancellation';
 import { isTestExecution } from '../../common/constants';
 import { traceInfo, traceWarning } from '../../common/logger';
-import { createDeferred, waitForPromise } from '../../common/utils/async';
+import { sleep, waitForPromise } from '../../common/utils/async';
 import * as localize from '../../common/utils/localize';
 import { noop } from '../../common/utils/misc';
 import { IConnection, IJupyterKernelSpec, IJupyterSession } from '../types';
@@ -173,24 +173,24 @@ export class JupyterSession implements IJupyterSession {
     }
 
     private async waitForIdleOnSession(session: Session.ISession | undefined, timeout: number): Promise<void> {
-        if (session && session.kernel && session.kernel.status !== 'idle') {
+        if (session && session.kernel) {
             traceInfo(`Waiting for idle on: ${session.kernel.id}${session.kernel.status}`);
 
-            // Just listen to the event until we get to idle
-            const deferred = createDeferred<boolean>();
-            const handler = (_s: Session.ISession, a: Kernel.Status) => {
-                if (a === 'idle') {
-                    traceInfo(`Completed waiting for idle on: ${session.kernel.id}${session.kernel.status}`);
-                    deferred.resolve(true);
-                }
-            };
-            session.statusChanged.connect(handler);
-            const result = waitForPromise(deferred.promise, timeout);
-            session.statusChanged.disconnect(handler);
-
-            // If that didn't work throw an exception
-            if (result === null || !result || !session || !session.kernel) {
-                traceInfo(`Failed waiting for idle on: ${session.kernel.id}${session.kernel.status}`);
+            // This function seems to cause CI builds to timeout randomly on
+            // different tests. Waiting for status to go idle doesn't seem to work and
+            // in the past, waiting on the ready promise doesn't work either. Check status with a maximum of 5 seconds
+            const startTime = Date.now();
+            while (session &&
+                session.kernel &&
+                session.kernel.status !== 'idle' &&
+                (Date.now() - startTime < timeout)) {
+                await sleep(100);
+            }
+
+            traceInfo(`Finished waiting for idle on: ${session.kernel.id}${session.kernel.status}`);
+
+            // If we didn't make it out in ten seconds, indicate an error
+            if (!session || !session.kernel || session.kernel.status !== 'idle') {
                 throw new JupyterWaitForIdleError(localize.DataScience.jupyterLaunchTimedOut());
             }
         }