microsoft · DonJayamanne · Nov 2, 2018 · Nov 1, 2018 · Nov 1, 2018 · Nov 1, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -90,6 +90,7 @@ script:
         bash <(curl -s https://codecov.io/bash);
     fi
   - if [ $FUNCTIONAL_TEST == "true" ]; then
+        python -m pip install --upgrade -r functionalTestRequirements.txt
         npm run cover:enable;
         npm run test:functional;
     fi

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -140,7 +140,23 @@
             "sourceMaps": true,
             "args": [
                 "timeout=300000",
-                "grep=History"
+                "grep="
+            ],
+            "outFiles": [
+                "${workspaceFolder}/out/**/*.js"
+            ],
+            "preLaunchTask": "Compile"
+        },
+        {
+            "name": "Functional Tests (without VS Code, *.functional.test.ts)",
+            "type": "node",
+            "request": "launch",
+            "program": "${workspaceFolder}/out/test/functionalTests.js",
+            "stopOnEntry": false,
+            "sourceMaps": true,
+            "args": [
+                "timeout=300000",
+                "grep="
             ],
             "outFiles": [
                 "${workspaceFolder}/out/**/*.js"

diff --git a/functionalTestRequirements.txt b/functionalTestRequirements.txt
@@ -0,0 +1,2 @@
+# List of requirements for functional tests
+jupyter
diff --git a/src/client/datascience/history.ts b/src/client/datascience/history.ts
@@ -200,7 +200,7 @@ export class History implements IWebPanelMessageListener, IHistory {
     @captureTelemetry(Telemetry.RestartKernel)
     private restartKernel() {
         if (this.jupyterServer) {
-            this.jupyterServer.restartKernel();
+            this.jupyterServer.restartKernel().ignoreErrors();
         }
     }
 

diff --git a/src/client/datascience/jupyterServer.ts b/src/client/datascience/jupyterServer.ts
@@ -181,7 +181,7 @@ export class JupyterServer implements INotebookServer {
             });
         }
 
-        return Promise.reject(localize.DataScience.sessionDisposed);
+        return Promise.reject(new Error(localize.DataScience.sessionDisposed()));
     }
 
     public get onStatusChanged() : vscode.Event<boolean> {
@@ -196,10 +196,12 @@ export class JupyterServer implements INotebookServer {
         }
     }
 
-    public restartKernel = () => {
+    public restartKernel = () : Promise<void> => {
         if (this.session && this.session.kernel) {
-            this.session.kernel.restart().ignoreErrors();
+            return this.session.kernel.restart();
         }
+
+        return Promise.reject(new Error(localize.DataScience.sessionDisposed()));
     }
 
     public translateToNotebook = async (cells: ICell[]) : Promise<nbformat.INotebookContent | undefined> => {

diff --git a/src/client/datascience/types.ts b/src/client/datascience/types.ts
@@ -31,7 +31,7 @@ export interface INotebookServer extends IDisposable {
     getCurrentState() : Promise<ICell[]>;
     executeObservable(code: string, file: string, line: number) : Observable<ICell[]>;
     execute(code: string, file: string, line: number) : Promise<ICell[]>;
-    restartKernel();
+    restartKernel() : Promise<void>;
     translateToNotebook(cells: ICell[]) : Promise<JSONObject | undefined>;
     launchNotebook(file: string) : Promise<boolean>;
 }

diff --git a/src/client/ioc/serviceManager.ts b/src/client/ioc/serviceManager.ts
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-
 import { Container, injectable, interfaces } from 'inversify';
-import { Abstract, IServiceManager, Newable } from './types';
+
+import { Abstract, ClassType, IServiceManager, Newable } from './types';
 
 type identifier<T> = string | symbol | Newable<T> | Abstract<T>;
 
@@ -43,4 +43,13 @@ export class ServiceManager implements IServiceManager {
     public getAll<T>(serviceIdentifier: identifier<T>, name?: string | number | symbol | undefined): T[] {
         return name ? this.container.getAllNamed<T>(serviceIdentifier, name) : this.container.getAll<T>(serviceIdentifier);
     }
+
+    public rebind<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>, constructor: ClassType<T>, name?: string | number | symbol): void {
+        if (name) {
+            this.container.rebind<T>(serviceIdentifier).to(constructor).whenTargetNamed(name);
+        } else {
+            this.container.rebind<T>(serviceIdentifier).to(constructor);
+        }
+    }
+
 }
diff --git a/src/client/ioc/types.ts b/src/client/ioc/types.ts
@@ -26,6 +26,7 @@ export interface IServiceManager {
     addFactory<T>(factoryIdentifier: interfaces.ServiceIdentifier<interfaces.Factory<T>>, factoryMethod: interfaces.FactoryCreator<T>): void;
     get<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>, name?: string | number | symbol): T;
     getAll<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>, name?: string | number | symbol): T[];
+    rebind<T>(serviceIdentifier: interfaces.ServiceIdentifier<T>, constructor: ClassType<T>, name?: string | number | symbol): void;
 }
 
 export const IServiceContainer = Symbol('IServiceContainer');
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# List of requirements for functional tests
		jupyter