Nightly.variable and interactive window test fixes (#13272)

* variable and interactive window test fixes

* review cleanup

Co-authored-by: Ian Huff <[email protected]>

Author: IanMatthewHuff

news/3 Code Health/13269.md

@@ -0,0 +1 @@
+Fix failing interactive window and variable explorer tests.

pythonFiles/vscode_datascience_helpers/getJupyterVariableShape.py

@@ -1,13 +1,13 @@
 # Query Jupyter server for defined variables list
 # Tested on 2.7 and 3.6
 import json as _VSCODE_json
-import ast as _VSCODE_ast
 
 # In IJupyterVariables.getValue this '_VSCode_JupyterTestValue' will be replaced with the json stringified value of the target variable
 # Indexes off of _VSCODE_targetVariable need to index types that are part of IJupyterVariable
 _VSCODE_targetVariable = _VSCODE_json.loads("""_VSCode_JupyterTestValue""")
 
-_VSCODE_evalResult = _VSCODE_ast.literal_eval(_VSCODE_targetVariable["name"])
+# Secure here as what we are doing an eval on is under our control
+_VSCODE_evalResult = eval(_VSCODE_targetVariable["name"])  # nosec
 
 # Find shape and count if available
 if hasattr(_VSCODE_evalResult, "shape"):

src/client/datascience/raw-kernel/liveshare/hostRawNotebookProvider.ts

@@ -23,15 +23,14 @@ import * as localize from '../../../common/utils/localize';
 import { noop } from '../../../common/utils/misc';
 import { IServiceContainer } from '../../../ioc/types';
 import { Identifiers, LiveShare, LiveShareCommands, Settings } from '../../constants';
-import { KernelSelector } from '../../jupyter/kernels/kernelSelector';
+import { KernelSelector, KernelSpecInterpreter } from '../../jupyter/kernels/kernelSelector';
 import { HostJupyterNotebook } from '../../jupyter/liveshare/hostJupyterNotebook';
 import { LiveShareParticipantHost } from '../../jupyter/liveshare/liveShareParticipantMixin';
 import { IRoleBasedObject } from '../../jupyter/liveshare/roleBasedFactory';
 import { IKernelLauncher } from '../../kernel-launcher/types';
 import { ProgressReporter } from '../../progress/progressReporter';
 import {
     IDataScienceFileSystem,
-    IJupyterKernelSpec,
     INotebook,
     INotebookExecutionInfo,
     INotebookExecutionLogger,
@@ -168,7 +167,7 @@ export class HostRawNotebookProvider
                 );
 
                 // Get the execution info for our notebook
-                const info = await this.getExecutionInfo(kernelSpecInterpreter.kernelSpec);
+                const info = await this.getExecutionInfo(kernelSpecInterpreter);
 
                 if (rawSession.isConnected) {
                     // Create our notebook
@@ -213,12 +212,12 @@ export class HostRawNotebookProvider
     }
 
     // Get the notebook execution info for this raw session instance
-    private async getExecutionInfo(kernelSpec?: IJupyterKernelSpec): Promise<INotebookExecutionInfo> {
+    private async getExecutionInfo(kernelSpecInterpreter: KernelSpecInterpreter): Promise<INotebookExecutionInfo> {
         return {
             connectionInfo: this.getConnection(),
             uri: Settings.JupyterServerLocalLaunch,
-            interpreter: undefined,
-            kernelSpec: kernelSpec,
+            interpreter: kernelSpecInterpreter.interpreter,
+            kernelSpec: kernelSpecInterpreter.kernelSpec,
             workingDir: await calculateWorkingDirectory(this.configService, this.workspaceService, this.fs),
             purpose: Identifiers.RawPurpose
         };

src/test/datascience/nativeEditor.functional.test.tsx

@@ -2458,17 +2458,7 @@ df.head()`;
                         assert.ok(fileObject.cells[0].metadata.collapsed, 'Metadata erased during execution');
 
                         // Old language info should be changed by the new execution
-                        if (!ioc.shouldMockJupyter) {
-                            // For real jupyter raw kernel will use a default kernel without associated interpreter language_info
-                            // so the execution should clear it out
-                            assert.isUndefined(
-                                fileObject.metadata.language_info,
-                                'Old language info should be cleared out'
-                            );
-                        } else {
-                            // In the mock case we return a mock kernelspec + interpreter language info, so it should be replaced
-                            assert.notEqual(fileObject.metadata.language_info.version, '1.2.3');
-                        }
+                        assert.notEqual(fileObject.metadata.language_info.version, '1.2.3');
 
                         // Some tests don't have a kernelspec, in which case we should remove it
                         // If there is a spec, we should update the name and display name