Functional test fixes for full jupyter runs (microsoft#7976)

Author: IanMatthewHuff

build/ci/vscode-python-nightly-flake-ci.yaml

@@ -63,6 +63,7 @@ stages:
  NeedsPythonFunctionalReqs: true
  # This tells the functional tests to not mock out Jupyter...
  VSCODE_PYTHON_ROLLING: true
+ timeoutInMinutes: 180
  'Linux-Py3.7 Functional':
  PythonVersion: '3.7'
  VMImageName: 'ubuntu-16.04'
@@ -84,6 +85,7 @@ stages:
  NeedsPythonTestReqs: true
  NeedsPythonFunctionalReqs: true
  VSCODE_PYTHON_ROLLING: true
+ timeoutInMinutes: 180
  'Linux-Py3.6 Functional':
  PythonVersion: '3.6'
  VMImageName: 'ubuntu-16.04'
@@ -105,6 +107,7 @@ stages:
  NeedsPythonTestReqs: true
  NeedsPythonFunctionalReqs: true
  VSCODE_PYTHON_ROLLING: true
+ timeoutInMinutes: 180
  'Linux-Py3.5 Functional':
  PythonVersion: '3.5'
  VMImageName: 'ubuntu-16.04'
@@ -126,6 +129,7 @@ stages:
  NeedsPythonTestReqs: true
  NeedsPythonFunctionalReqs: true
  VSCODE_PYTHON_ROLLING: true
+ timeoutInMinutes: 180
  'Linux-Py2.7 Functional':
  PythonVersion: '2.7'
  VMImageName: 'ubuntu-16.04'

news/3 Code Health/7877.md

@@ -0,0 +1 @@
+Fix native editor mime type functional test.

news/3 Code Health/7878.md

@@ -0,0 +1 @@
+Fix variable explorer loading test.

src/test/datascience/debugger.functional.test.tsx

@@ -275,7 +275,7 @@ suite('DataScience Debugger tests', () => {
  const resultPromise = getInteractiveCellResults(ioc.wrapper!, 5, async () => {
  const breakPromise = createDeferred<void>();
  disposables.push(mockDebuggerService!.onBreakpointHit(() => breakPromise.resolve()));
- const done = history.debugCode(code, fileName, 0, docManager.activeTextEditor);
+ const done = history.debugCode(code, '\\Untitled-1', 0, docManager.activeTextEditor);
  await waitForPromise(Promise.race([done, breakPromise.promise]), 60000);
  assert.ok(breakPromise.resolved, 'Breakpoint event did not fire');
  assert.ok(!lastErrorMessage, `Error occurred ${lastErrorMessage}`);

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

@@ -123,25 +123,25 @@ suite('DataScience Native Editor', () => {
  await createNewEditor(ioc);
 
  const badPanda = `import pandas as pd
- df = pd.read("${escapePath(path.join(srcDirectory(), 'DefaultSalesReport.csv'))}")
- df.head()`;
+df = pd.read("${escapePath(path.join(srcDirectory(), 'DefaultSalesReport.csv'))}")
+df.head()`;
  const goodPanda = `import pandas as pd
- df = pd.read_csv("${escapePath(path.join(srcDirectory(), 'DefaultSalesReport.csv'))}")
- df.head()`;
+df = pd.read_csv("${escapePath(path.join(srcDirectory(), 'DefaultSalesReport.csv'))}")
+df.head()`;
  const matPlotLib = 'import matplotlib.pyplot as plt\r\nimport numpy as np\r\nx = np.linspace(0,20,100)\r\nplt.plot(x, np.sin(x))\r\nplt.show()';
  const matPlotLibResults = 'img';
  const spinningCursor = `import sys
- import time
- def spinning_cursor():
-  while True:
-  for cursor in '|/-\\\\':
-  yield cursor
- spinner = spinning_cursor()
- for _ in range(50):
-  sys.stdout.write(next(spinner))
-  sys.stdout.flush()
-  time.sleep(0.1)
-  sys.stdout.write('\\r')`;
+import time
+def spinning_cursor():
+ while True:
+ for cursor in '|/-\\\\':
+ yield cursor
+spinner = spinning_cursor()
+for _ in range(50):
+ sys.stdout.write(next(spinner))
+ sys.stdout.flush()
+ time.sleep(0.1)
+ sys.stdout.write('\\r')`;
 
  addMockData(ioc, badPanda, `pandas has no attribute 'read'`, 'text/html', 'error');
  addMockData(ioc, goodPanda, `<td>A table</td>`, 'text/html');

src/test/datascience/variableexplorer.functional.test.tsx

@@ -14,8 +14,8 @@ import { InteractivePanel } from '../../datascience-ui/history-react/interactive
 import { VariableExplorer } from '../../datascience-ui/interactive-common/variableExplorer';
 import { NativeEditor } from '../../datascience-ui/native-editor/nativeEditor';
 import { DataScienceIocContainer } from './dataScienceIocContainer';
-import { addCode } from './interactiveWindowTestHelpers';
-import { addCell, createNewEditor } from './nativeEditorTestHelpers';
+import { addCode, runMountedTest as interactiveRunMountedTest } from './interactiveWindowTestHelpers';
+import { addCell, createNewEditor, runMountedTest as nativeRunMountedTest } from './nativeEditorTestHelpers';
 import { waitForUpdate } from './reactHelpers';
 import { runDoubleTest, waitForMessage } from './testHelpers';
 
@@ -65,6 +65,34 @@ suite('DataScience Interactive Window variable explorer tests', () => {
  return waitForMessage(ioc, InteractiveWindowMessages.VariablesComplete);
  }
 
+ async function checkVariableLoading(wrapper: ReactWrapper<any, Readonly<{}>, React.Component>, targetRenderCount: number) {
+ const basicCode: string = `value = 'hello world'`;
+
+ openVariableExplorer(wrapper);
+
+ await addCodeImpartial(wrapper, 'a=1\na');
+ await addCodeImpartial(wrapper, basicCode, false, 4);
+
+ // Target a render count before loading is finished
+ await waitForUpdate(wrapper, VariableExplorer, targetRenderCount);
+
+ let targetVariables: IJupyterVariable[] = [
+ {name: 'a', value: '1', supportsDataExplorer: false, type: 'int', size: 54, shape: '', count: 0, truncated: false},
+ {name: 'value', value: 'Loading...', supportsDataExplorer: false, type: 'str', size: 54, shape: '', count: 0, truncated: false}
+ ];
+ verifyVariables(wrapper, targetVariables);
+
+ // Now wait for one more update and then check the variables, we should have loaded the value var
+ await waitForUpdate(wrapper, VariableExplorer, 1);
+
+ targetVariables = [
+ {name: 'a', value: '1', supportsDataExplorer: false, type: 'int', size: 54, shape: '', count: 0, truncated: false},
+ // tslint:disable-next-line:quotemark
+ {name: 'value', value: "'hello world'", supportsDataExplorer: false, type: 'str', size: 54, shape: '', count: 0, truncated: false}
+ ];
+ verifyVariables(wrapper, targetVariables);
+ }
+
  async function addCodeImpartial(wrapper: ReactWrapper<any, Readonly<{}>, React.Component>, code: string, waitForVariables: boolean = true, expectedRenderCount: number = 4, expectError: boolean = false): Promise<ReactWrapper<any, Readonly<{}>, React.Component>> {
  const variablesUpdated = waitForVariables ? waitForVariablesUpdated() : Promise.resolve();
  const nodes = wrapper.find('InteractivePanel');
@@ -153,33 +181,14 @@ value = 'hello world'`;
  verifyVariables(wrapper, targetVariables);
  }, () => { return ioc; });
 
- runDoubleTest('Variable explorer - Loading', async (wrapper) => {
- const basicCode: string = `value = 'hello world'`;
-
- openVariableExplorer(wrapper);
-
- await addCodeImpartial(wrapper, 'a=1\na');
- await addCodeImpartial(wrapper, basicCode, false, 4);
-
- // Here we are only going to wait for two renders instead of the needed three
- // a should have the value updated, but value should still be loading
- await waitForUpdate(wrapper, VariableExplorer, 2);
-
- let targetVariables: IJupyterVariable[] = [
- {name: 'a', value: '1', supportsDataExplorer: false, type: 'int', size: 54, shape: '', count: 0, truncated: false},
- {name: 'value', value: 'Loading...', supportsDataExplorer: false, type: 'str', size: 54, shape: '', count: 0, truncated: false}
- ];
- verifyVariables(wrapper, targetVariables);
-
- // Now wait for one more update and then check the variables, we should have loaded the value var
- await waitForUpdate(wrapper, VariableExplorer, 1);
+ // For the loading tests we check before the explorer is fully loaded, so split tests here to check
+ // with different target render counts
+ nativeRunMountedTest('Variable Explorer - Native Loading', async (wrapper) => {
+ await checkVariableLoading(wrapper, 3);
+ }, () => { return ioc; });
 
- targetVariables = [
- {name: 'a', value: '1', supportsDataExplorer: false, type: 'int', size: 54, shape: '', count: 0, truncated: false},
- // tslint:disable-next-line:quotemark
- {name: 'value', value: "'hello world'", supportsDataExplorer: false, type: 'str', size: 54, shape: '', count: 0, truncated: false}
- ];
- verifyVariables(wrapper, targetVariables);
+ interactiveRunMountedTest('Variable Explorer - Interactive Loading', async (wrapper) => {
+ await checkVariableLoading(wrapper, 2);
  }, () => { return ioc; });
 
  // Test our display of basic types. We render 8 rows by default so only 8 values per test