log collection of test collection

Author: DonJayamanne

src/client/unittests/nosetest/collector.ts

@@ -6,6 +6,7 @@ import * as os from 'os';
 import { extractBetweenDelimiters, convertFileToPackage, flattenTestFiles } from '../common/testUtils';
 import { CancellationToken } from 'vscode';
 import { PythonSettings } from '../../common/configSettings';
+import { OutputChannel } from 'vscode';
 
 const pythonSettings = PythonSettings.getInstance();
 const NOSE_WANT_FILE_PREFIX = 'nose.selector: DEBUG: wantFile ';
@@ -20,7 +21,7 @@ const argsToExcludeForDiscovery = ['-v', '--verbose',
     '--failed', '--process-restartworker', '--with-xunit'];
 const settingsInArgsToExcludeForDiscovery = ['--verbosity'];
 
-export function discoverTests(rootDirectory: string, args: string[], token: CancellationToken): Promise<Tests> {
+export function discoverTests(rootDirectory: string, args: string[], token: CancellationToken, ignoreCache: boolean, outChannel: OutputChannel): Promise<Tests> {
     let logOutputLines: string[] = [''];
     let testFiles: TestFile[] = [];
 
@@ -79,6 +80,7 @@ export function discoverTests(rootDirectory: string, args: string[], token: Canc
 
     return execPythonFile(pythonSettings.unitTest.nosetestPath, args.concat(['--collect-only', '-vvv']), rootDirectory, true)
         .then(data => {
+            outChannel.appendLine(data);            
             processOutput(data);
 
             // Exclude tests that don't have any functions or test suites

src/client/unittests/nosetest/main.ts

@@ -16,7 +16,7 @@ export class TestManager extends BaseTestManager {
     }
     discoverTestsImpl(ignoreCache: boolean): Promise<Tests> {
         let args = settings.unitTest.nosetestArgs.slice(0);
-        return discoverTests(this.rootDirectory, args, this.cancellationToken);
+        return discoverTests(this.rootDirectory, args, this.cancellationToken, ignoreCache, this.outputChannel);
     }
     runTestImpl(tests: Tests, testsToRun?: TestsToRun, runFailedTests?: boolean, debug?: boolean): Promise<any> {
         let args = settings.unitTest.nosetestArgs.slice(0);

src/client/unittests/pytest/collector.ts

@@ -6,6 +6,7 @@ import { extractBetweenDelimiters, flattenTestFiles, convertFileToPackage } from
 import * as vscode from 'vscode';
 import * as path from 'path';
 import { PythonSettings } from '../../common/configSettings';
+import { OutputChannel } from 'vscode';
 
 const pythonSettings = PythonSettings.getInstance();
 
@@ -17,7 +18,7 @@ const argsToExcludeForDiscovery = ['-x', '--exitfirst',
     '--disable-pytest-warnings', '-l', '--showlocals'];
 const settingsInArgsToExcludeForDiscovery = [];
 
-export function discoverTests(rootDirectory: string, args: string[], token: vscode.CancellationToken, ignoreCache: boolean): Promise<Tests> {
+export function discoverTests(rootDirectory: string, args: string[], token: vscode.CancellationToken, ignoreCache: boolean, outChannel: OutputChannel): Promise<Tests> {
     let logOutputLines: string[] = [''];
     let testFiles: TestFile[] = [];
     let parentNodes: { indent: number, item: TestFile | TestSuite }[] = [];
@@ -86,6 +87,7 @@ export function discoverTests(rootDirectory: string, args: string[], token: vsco
 
     return execPythonFile(pythonSettings.unitTest.pyTestPath, args.concat(['--collect-only']), rootDirectory, false, null, token)
         .then(data => {
+            outChannel.appendLine(data);
             processOutput(data);
             if (token && token.isCancellationRequested) {
                 return Promise.reject<Tests>('cancelled');

src/client/unittests/pytest/main.ts

@@ -14,7 +14,7 @@ export class TestManager extends BaseTestManager {
     }
     discoverTestsImpl(ignoreCache: boolean): Promise<Tests> {
         let args = settings.unitTest.pyTestArgs.slice(0);
-        return discoverTests(this.rootDirectory, args, this.cancellationToken, ignoreCache);
+        return discoverTests(this.rootDirectory, args, this.cancellationToken, ignoreCache, this.outputChannel);
     }
     runTestImpl(tests: Tests, testsToRun?: TestsToRun, runFailedTests?: boolean, debug?: boolean): Promise<any> {
         let args = settings.unitTest.pyTestArgs.slice(0);

src/client/unittests/unittest/collector.ts

@@ -5,10 +5,11 @@ import { flattenTestFiles } from '../common/testUtils';
 import * as vscode from 'vscode';
 import * as path from 'path';
 import { PythonSettings } from '../../common/configSettings';
+import { OutputChannel } from 'vscode';
 
 const pythonSettings = PythonSettings.getInstance();
 
-export function discoverTests(rootDirectory: string, args: string[], token: vscode.CancellationToken): Promise<Tests> {
+export function discoverTests(rootDirectory: string, args: string[], token: vscode.CancellationToken, ignoreCache: boolean, outChannel: OutputChannel): Promise<Tests> {
     let startDirectory = '.';
     let pattern = 'test*.py';
     const indexOfStartDir = args.findIndex(arg => arg.indexOf('-s') === 0);
@@ -74,6 +75,7 @@ for suite in suites._tests:
     args = [];
     return execPythonFile(pythonSettings.pythonPath, args.concat(['-c', pythonScript]), rootDirectory, true, null, token)
         .then(data => {
+            outChannel.appendLine(data);
             processOutput(data);
             if (token && token.isCancellationRequested) {
                 return Promise.reject<Tests>('cancelled');

src/client/unittests/unittest/main.ts

@@ -16,7 +16,7 @@ export class TestManager extends BaseTestManager {
     }
     discoverTestsImpl(ignoreCache: boolean): Promise<Tests> {
         let args = settings.unitTest.unittestArgs.slice(0);
-        return discoverTests(this.rootDirectory, args, this.cancellationToken);
+        return discoverTests(this.rootDirectory, args, this.cancellationToken, ignoreCache, this.outputChannel);
     }
     runTestImpl(tests: Tests, testsToRun?: TestsToRun, runFailedTests?: boolean, debug?: boolean): Promise<any> {
         let args = settings.unitTest.unittestArgs.slice(0);