Fixes to tests

Author: DonJayamanne

src/client/datascience/jupyter/kernels/cellExecution.ts

@@ -123,7 +123,10 @@ export class CellExecution {
         this.started = true;
         // Ensure we clear the cell state and trigger a change.
         clearCellForExecution(this.cell);
-        this.cell.metadata.runStartTime = new Date().getTime();
+        new WorkspaceEdit().replaceCellMetadata(this.cell.notebook.uri, this.cell.notebook.cells.indexOf(this.cell), {
+            ...this.cell.metadata,
+            runStartTime: new Date().getTime()
+        });
         this.stopWatch.reset();
         // Changes to metadata must be saved in ipynb, hence mark doc has dirty.
         this.contentProvider.notifyChangesToDocument(this.cell.notebook);
@@ -158,7 +161,10 @@ export class CellExecution {
 
     private completedWithErrors(error: Partial<Error>) {
         this.sendPerceivedCellExecute();
-        this.cell.metadata.lastRunDuration = this.stopWatch.elapsedTime;
+        new WorkspaceEdit().replaceCellMetadata(this.cell.notebook.uri, this.cell.notebook.cells.indexOf(this.cell), {
+            ...this.cell.metadata,
+            lastRunDuration: this.stopWatch.elapsedTime
+        });
         updateCellWithErrorStatus(this.cell, error);
         this.contentProvider.notifyChangesToDocument(this.cell.notebook);
         this.errorHandler.handleError((error as unknown) as Error).ignoreErrors();

src/test/datascience/notebook/edit.ds.test.ts

@@ -57,7 +57,7 @@ suite('DataScience - VSCode Notebook - (Execution) (slow)', function () {
     setup(deleteAllCellsAndWait);
     suiteTeardown(() => closeNotebooksAndCleanUpAfterTests(disposables));
     test('Execute cell using VSCode Kernel', async () => {
-        await insertPythonCellAndWait('print("Hello World")', 0);
+        await insertPythonCellAndWait('print("Hello World")');
         const cell = vscodeNotebook.activeNotebookEditor?.document.cells![0]!;
 
         await executeCell(cell);
@@ -70,7 +70,7 @@ suite('DataScience - VSCode Notebook - (Execution) (slow)', function () {
         );
     });
     test('Executed events are triggered', async () => {
-        await insertPythonCellAndWait('print("Hello World")', 0);
+        await insertPythonCellAndWait('print("Hello World")');
         const cell = vscodeNotebook.activeNotebookEditor?.document.cells![0]!;
 
         const executed = createEventHandler(editorProvider.activeEditor!, 'executed', disposables);
@@ -88,7 +88,7 @@ suite('DataScience - VSCode Notebook - (Execution) (slow)', function () {
         await codeExecuted.assertFired(1_000);
     });
     test('Empty cell will not get executed', async () => {
-        await insertPythonCellAndWait('', 0);
+        await insertPythonCellAndWait('');
         const cell = vscodeNotebook.activeNotebookEditor?.document.cells![0]!;
         await executeCell(cell);
 
@@ -97,8 +97,8 @@ suite('DataScience - VSCode Notebook - (Execution) (slow)', function () {
         assert.isUndefined(cell?.metadata.runState);
     });
     test('Empty cells will not get executed when running whole document', async () => {
-        await insertPythonCellAndWait('', 0);
-        await insertPythonCellAndWait('print("Hello World")', 1);
+        await insertPythonCellAndWait('');
+        await insertPythonCellAndWait('print("Hello World")');
         const cells = vscodeNotebook.activeNotebookEditor?.document.cells!;
 
         await executeActiveDocument();
@@ -112,7 +112,7 @@ suite('DataScience - VSCode Notebook - (Execution) (slow)', function () {
         assert.isUndefined(cells[0].metadata.runState);
     });
     test('Execute cell should mark a notebook as being dirty', async () => {
-        await insertPythonCellAndWait('print("Hello World")', 0);
+        await insertPythonCellAndWait('print("Hello World")');
         const contentProvider = api.serviceContainer.get<INotebookContentProvider>(INotebookContentProvider);
         const cell = vscodeNotebook.activeNotebookEditor?.document.cells![0]!;
         const changedEvent = createEventHandler(contentProvider, 'onDidChangeNotebook', disposables);
@@ -128,7 +128,7 @@ suite('DataScience - VSCode Notebook - (Execution) (slow)', function () {
         assert.ok(changedEvent.fired, 'Notebook should be dirty after executing a cell');
     });
     test('Verify Cell output, execution count and status', async () => {
-        await insertPythonCellAndWait('print("Hello World")', 0);
+        await insertPythonCellAndWait('print("Hello World")');
         const cell = vscodeNotebook.activeNotebookEditor?.document.cells![0]!;
 
         await executeActiveDocument();
@@ -147,8 +147,8 @@ suite('DataScience - VSCode Notebook - (Execution) (slow)', function () {
         assert.ok(cell.metadata.executionOrder, 'Execution count should be > 0');
     });
     test('Verify multiple cells get executed', async () => {
-        await insertPythonCellAndWait('print("Foo Bar")', 0);
-        await insertPythonCellAndWait('print("Hello World")', 1);
+        await insertPythonCellAndWait('print("Foo Bar")');
+        await insertPythonCellAndWait('print("Hello World")');
         const cells = vscodeNotebook.activeNotebookEditor?.document.cells!;
 
         await executeActiveDocument();
@@ -163,14 +163,14 @@ suite('DataScience - VSCode Notebook - (Execution) (slow)', function () {
 
         // Verify output.
         assertHasTextOutputInVSCode(cells[0], 'Foo Bar', 0);
-        assertHasTextOutputInVSCode(cells[1], 'Hello World', 0);
+        assertHasTextOutputInVSCode(cells[1], 'Hello World', 1);
 
         // Verify execution count.
         assert.ok(cells[0].metadata.executionOrder, 'Execution count should be > 0');
         assert.equal(cells[1].metadata.executionOrder! - 1, cells[0].metadata.executionOrder!);
     });
     test('Verify metadata for successfully executed cell', async () => {
-        await insertPythonCellAndWait('print("Foo Bar")', 0);
+        await insertPythonCellAndWait('print("Foo Bar")');
         const cell = vscodeNotebook.activeNotebookEditor?.document.cells![0]!;
 
         await executeActiveDocument();
@@ -189,7 +189,7 @@ suite('DataScience - VSCode Notebook - (Execution) (slow)', function () {
         assert.equal(cell.metadata.statusMessage, '', 'Incorrect Status message');
     });
     test('Verify output & metadata for executed cell with errors', async () => {
-        await insertPythonCellAndWait('print(abcd)', 0);
+        await insertPythonCellAndWait('print(abcd)');
         const cell = vscodeNotebook.activeNotebookEditor?.document.cells![0]!;
 
         await executeActiveDocument();
@@ -215,9 +215,9 @@ suite('DataScience - VSCode Notebook - (Execution) (slow)', function () {
         assert.include(cell.metadata.statusMessage!, 'abcd', 'Must contain error message');
     });
     test('Updating display data', async () => {
-        await insertPythonCellAndWait('from IPython.display import Markdown\n', 0);
-        await insertPythonCellAndWait('dh = display(display_id=True)\n', 1);
-        await insertPythonCellAndWait('dh.update(Markdown("foo"))\n', 2);
+        await insertPythonCellAndWait('from IPython.display import Markdown\n');
+        await insertPythonCellAndWait('dh = display(display_id=True)\n');
+        await insertPythonCellAndWait('dh.update(Markdown("foo"))\n');
         const displayCell = vscodeNotebook.activeNotebookEditor?.document.cells![1]!;
         const updateCell = vscodeNotebook.activeNotebookEditor?.document.cells![2]!;
 
@@ -252,8 +252,7 @@ suite('DataScience - VSCode Notebook - (Execution) (slow)', function () {
                         time.sleep(0.1)
                         print(i)
 
-                    print("End")`,
-            0
+                    print("End")`
         );
         const cell = vscodeNotebook.activeNotebookEditor?.document.cells![0]!;