Reduce logging and retry widget test (#9905)

microsoft · May 9, 2022 · 10b68b6 · 10b68b6
1 parent bd421a3
commit 10b68b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/kernels/kernelProvider.base.ts b/src/kernels/kernelProvider.base.ts
@@ -112,12 +112,11 @@ export abstract class BaseKernelProvider implements IKernelProvider {
  protected disposeOldKernel(uri: Uri) {
  const notebook = workspace.notebookDocuments.find((nb) => nb.uri.toString() === uri.toString());
  if (notebook) {
- traceInfoIfCI(
- `Disposing kernel associated with ${getDisplayPath(notebook.uri)}, isClosed=${notebook.isClosed}`
- );
-
  const kernelToDispose = this.kernelsByNotebook.get(notebook);
  if (kernelToDispose) {
+ traceInfoIfCI(
+ `Disposing kernel associated with ${getDisplayPath(notebook.uri)}, isClosed=${notebook.isClosed}`
+ );
  this.pendingDisposables.add(kernelToDispose.kernel);
  kernelToDispose.kernel
  .dispose()
@@ -127,9 +126,9 @@ export abstract class BaseKernelProvider implements IKernelProvider {
  }
  this.kernelsByNotebook.delete(notebook);
  } else {
- traceInfoIfCI(`Disposing kernel associated with ${getDisplayPath(uri)}`);
  const kernelToDispose = this.kernelsByUri.get(uri.toString());
  if (kernelToDispose) {
+ traceInfoIfCI(`Disposing kernel associated with ${getDisplayPath(uri)}`);
  this.pendingDisposables.add(kernelToDispose.kernel);
  kernelToDispose.kernel
  .dispose()

diff --git a/src/test/datascience/widgets/standard.vscode.test.ts b/src/test/datascience/widgets/standard.vscode.test.ts
@@ -41,6 +41,8 @@ suite('Standard IPyWidget (Execution) (slow) (WIDGET_TEST)', function () {
  this.timeout(120_000);
  let previousWidgetScriptSourcesSettingValue: string[] | undefined = undefined;
  const widgetScriptSourcesValue = ['jsdelivr.com', 'unpkg.com'];
+ // Retry at least once, because ipywidgets can be flaky (network, comms, etc).
+ this.retries(1);
  suiteSetup(async function () {
  traceInfo('Suite Setup VS Code Notebook - Execution');
  this.timeout(120_000);