Fix nightly tests (#6767)

rchiodo · web-flow · commit b803dfa76a9e · 2019-07-30T10:27:45.000-07:00
* Fix nightly tests

* Fix linter error
diff --git a/src/test/datascience/debugger.functional.test.tsx b/src/test/datascience/debugger.functional.test.tsx
@@ -20,6 +20,7 @@ import {
 import { InteractiveWindowMessages } from '../../client/datascience/interactive-window/interactiveWindowTypes';
 import { IInteractiveWindow, IInteractiveWindowProvider, IJupyterExecution } from '../../client/datascience/types';
 import { MainPanel } from '../../datascience-ui/history-react/MainPanel';
+import { noop } from '../core';
 import { DataScienceIocContainer } from './dataScienceIocContainer';
 import { getCellResults } from './interactiveWindowTestHelpers';
 import { getConnectionInfo, getNotebookCapableInterpreter } from './jupyterHelpers';
@@ -138,7 +139,7 @@ suite('DataScience Debugger tests', () => {
         return result;
     }
 
-    async function debugCell(code: string, breakpoint?: Range, breakpointFile?: string) : Promise<void> {
+    async function debugCell(code: string, breakpoint?: Range, breakpointFile?: string, expectError?: boolean) : Promise<void> {
         // Create a dummy document with just this code
         const docManager = ioc.get<IDocumentManager>(IDocumentManager) as MockDocumentManager;
         const fileName = path.join(EXTENSION_ROOT_DIR, 'foo.py');
@@ -163,21 +164,36 @@ suite('DataScience Debugger tests', () => {
         const expectedBreakLine = breakpoint && !breakpointFile ? breakpoint.start.line : 2; // 2 because of the 'breakpoint()' that gets added
 
         // Debug this code. We should either hit the breakpoint or stop on entry
-        const results = await getCellResults(ioc.wrapper!, 5, async () => {
+        const resultPromise = getCellResults(ioc.wrapper!, 5, async () => {
             const breakPromise = createDeferred<void>();
             disposables.push(mockDebuggerService!.onBreakpointHit(() => breakPromise.resolve()));
             const done = history.debugCode(code, fileName, 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}`);
-            const stackTrace = await mockDebuggerService!.getStackTrace();
-            assert.ok(stackTrace, 'Stack trace not computable');
-            assert.ok(stackTrace!.body.stackFrames.length >= 1, 'Not enough frames');
-            assert.equal(stackTrace!.body.stackFrames[0].line, expectedBreakLine, 'Stopped on wrong line number');
-            // Verify break location
-            await mockDebuggerService!.continue();
+            if (expectError) {
+                assert.ok(lastErrorMessage, 'Error did not occur when expected');
+                throw Error('Exiting cell results');
+            } else {
+                assert.ok(breakPromise.resolved, 'Breakpoint event did not fire');
+                assert.ok(!lastErrorMessage, `Error occurred ${lastErrorMessage}`);
+                const stackTrace = await mockDebuggerService!.getStackTrace();
+                assert.ok(stackTrace, 'Stack trace not computable');
+                assert.ok(stackTrace!.body.stackFrames.length >= 1, 'Not enough frames');
+                assert.equal(stackTrace!.body.stackFrames[0].line, expectedBreakLine, 'Stopped on wrong line number');
+                // Verify break location
+                await mockDebuggerService!.continue();
+            }
         });
-        assert.ok(results, 'No cell results after finishing debugging');
+
+        if (!expectError) {
+            const cellResults = await resultPromise;
+            assert.ok(cellResults, 'No cell results after finishing debugging');
+        } else {
+            try {
+                await resultPromise;
+            } catch {
+                noop();
+            }
+        }
         await history.dispose();
     }
 
@@ -221,7 +237,7 @@ suite('DataScience Debugger tests', () => {
             ioc.getSettings().datascience.jupyterServerURI = uri;
 
             // Debug with this setting should use the server URI
-            await debugCell('#%%\nprint("bar")');
+            await debugCell('#%%\nprint("bar")', undefined, undefined, true);
         }
     });
 });
diff --git a/src/test/datascience/interactiveWindow.functional.test.tsx b/src/test/datascience/interactiveWindow.functional.test.tsx
@@ -180,7 +180,7 @@ 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 = 'svg';
+        const matPlotLibResults = 'img';
         const spinningCursor = `import sys
 import time
 
@@ -599,9 +599,9 @@ for _ in range(50):
             const outHtml = output.html();
 
             const root = parse(outHtml) as any;
-            const svgs = root.querySelectorAll('svg') as HTMLElement[];
-            assert.ok(svgs, 'No svgs found');
-            assert.equal(svgs.length, 1, 'Wrong number of svgs');
+            const png = root.querySelectorAll('img') as HTMLElement[];
+            assert.ok(png, 'No pngs found');
+            assert.equal(png.length, 1, 'Wrong number of pngs');
         }
 
     }, () => { return ioc; });
