Revert "Fix intermittent test failures"

This reverts commit baca18b.

Author: rchiodo

news/3 Code Health/4936.md

@@ -574,8 +574,7 @@ export class JupyterServerBase implements INotebookServer {
  if (this.launchInfo && this.launchInfo.connectionInfo) {
  // If the server crashes, cancel the current observable
  exitHandlerDisposable = this.launchInfo.connectionInfo.disconnected((c) => {
- const str = c ? c.toString() : '';
- subscriber.error(this.sessionStartTime, new Error(localize.DataScience.jupyterServerCrashed().format(str)));
+ subscriber.error(this.sessionStartTime, new Error(localize.DataScience.jupyterServerCrashed().format(c.toString())));
  subscriber.complete(this.sessionStartTime);
  });
  }

news/3 Code Health/4951.md

@@ -20,7 +20,6 @@ import { callWithTimeout, sleep } from '../../common/utils/async';
 import * as localize from '../../common/utils/localize';
 import { noop } from '../../common/utils/misc';
 import { IConnection, IJupyterKernelSpec, IJupyterSession } from '../types';
-import { isTestExecution } from '../../common/constants';
 
 export class JupyterSession implements IJupyterSession {
  private connInfo: IConnection | undefined;
@@ -183,17 +182,17 @@ export class JupyterSession implements IJupyterSession {
  if (this.session) {
  try {
  // Shutdown may fail if the process has been killed
- await Promise.race([this.session.shutdown(), sleep(1000)]);
+ await Promise.race([this.session.shutdown(), sleep(100)]);
  } catch {
  noop();
  }
  // Dispose may not return. Wrap in a promise instead. Kernel futures can die if
  // process is already dead.
- if (this.session && !isTestExecution()) {
+ if (this.session) {
  await callWithTimeout(this.session.dispose.bind(this.session), 100);
  }
  }
- if (this.sessionManager && !isTestExecution()) {
+ if (this.sessionManager) {
  await callWithTimeout(this.sessionManager.dispose.bind(this.sessionManager), 100);
  }
  } catch {

src/client/datascience/jupyter/jupyterServer.ts

@@ -126,10 +126,7 @@ class Emitter<T> {
  if (typeof item.listener === 'function') {
  result = item.listener.call(undefined, item.event);
  } else {
- const func = item.listener[0];
- if (func) {
- result = item.listener[0].call(item.listener[1], item.event);
- }
+ result = item.listener[0].call(item.listener[1], item.event);
  }
  }
  } catch (e) {