Merge pull request DonJayamanne#164 from aschlapsi/master

DonJayamanne · web-flow · commit 63b85deb3a30 · 2016-06-16T08:44:19.000+10:00
Added support for pytest as unit test option
diff --git a/package.json b/package.json
@@ -446,6 +446,16 @@
           "default": "nosetests",
           "description": "Path to nosetests, you can use a custom version of nosetests by modifying this setting to include the full path."
         },
+        "python.unitTest.pyTestEnabled": {
+          "type": "boolean",
+          "default": false,
+          "description": "Whether to enable or disable unit testing using pytest."
+        },
+        "python.unitTest.pyTestPath": {
+          "type": "string",
+          "default": "pytest",
+          "description": "Path to pytest, you can use a custom version of pytest by modifying this setting to include the full path."
+        },
         "python.unitTest.unittestEnabled": {
           "type": "boolean",
           "default": true,
diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts
@@ -14,6 +14,8 @@ export interface IPythonSettings {
 export interface IUnitTestSettings {
     nosetestsEnabled: boolean;
     nosetestPath: string;
+    pyTestEnabled: boolean;
+    pyTestPath: string;
     unittestEnabled: boolean;
     outputWindow: string;
 }
diff --git a/src/client/providers/testprovider.ts b/src/client/providers/testprovider.ts
@@ -3,6 +3,7 @@ import * as vscode from "vscode";
 import * as baseTest from "./../unittest/baseTestRunner";
 import * as unittest from "./../unittest/unittest";
 import * as nosetest from "./../unittest/nosetests";
+import * as pytest from "./../unittest/pytest";
 import * as settings from "./../common/configSettings";
 import * as telemetryHelper from "../common/telemetry";
 import * as telemetryContracts from "../common/telemetryContracts";
@@ -16,6 +17,7 @@ export function activateUnitTestProvider(context: vscode.ExtensionContext, setti
 
     testProviders.push(new unittest.PythonUnitTest(settings, outputChannel));
     testProviders.push(new nosetest.NoseTests(settings, outputChannel));
+    testProviders.push(new pytest.PyTestTests(settings, outputChannel));
 }
 
 function runUnitTests(filePath: string = "") {
diff --git a/src/client/unittest/pytest.ts b/src/client/unittest/pytest.ts
@@ -0,0 +1,29 @@
+"use strict";
+
+import * as baseTestRunner from "./baseTestRunner";
+import * as settings from "./../common/configSettings";
+import {OutputChannel} from "vscode";
+
+export class PyTestTests extends baseTestRunner.BaseTestRunner {
+    constructor(pythonSettings: settings.IPythonSettings, outputChannel: OutputChannel) {
+        super("pytest", pythonSettings, outputChannel, true);
+    }
+
+    public isEnabled(): boolean {
+        return this.pythonSettings.unitTest.pyTestEnabled;
+    }
+
+    public runTests(filePath: string = ""): Promise<any> {
+        if (!this.pythonSettings.unitTest.pyTestEnabled) {
+            return Promise.resolve();
+        }
+
+        let pyTestPath = this.pythonSettings.unitTest.pyTestPath;
+        let cmdLine = `${pyTestPath} ${filePath}`;
+        return new Promise<any>(resolve => {
+            this.run(cmdLine).then(messages => {
+                resolve(messages);
+            });
+        });
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ export interface IPythonSettings {`
`14`	`14`	`export interface IUnitTestSettings {`
`15`	`15`	`nosetestsEnabled: boolean;`
`16`	`16`	`nosetestPath: string;`
	`17`	`+ pyTestEnabled: boolean;`
	`18`	`+ pyTestPath: string;`
`17`	`19`	`unittestEnabled: boolean;`
`18`	`20`	`outputWindow: string;`
`19`	`21`	`}`