fix #517

Author: DonJayamanne

src/client/unittests/nosetest/runner.ts

@@ -1,13 +1,15 @@
 'use strict';
-import {createTemporaryFile} from '../../common/helpers';
-import {OutputChannel, CancellationToken} from 'vscode';
-import {TestsToRun, Tests} from '../common/contracts';
-import {updateResults} from '../common/testUtils';
-import {updateResultsFromXmlLogFile, PassCalculationFormulae} from '../common/xUnitParser';
-import {run} from '../common/runner';
-import {PythonSettings} from '../../common/configSettings';
+import { createTemporaryFile } from '../../common/helpers';
+import { OutputChannel, CancellationToken } from 'vscode';
+import { TestsToRun, Tests } from '../common/contracts';
+import { updateResults } from '../common/testUtils';
+import { updateResultsFromXmlLogFile, PassCalculationFormulae } from '../common/xUnitParser';
+import { run } from '../common/runner';
+import { PythonSettings } from '../../common/configSettings';
 
 const pythonSettings = PythonSettings.getInstance();
+const WITH_XUNIT = '--with-xunit';
+const XUNIT_FILE = '--xunit-file';
 
 export function runTest(rootDirectory: string, tests: Tests, args: string[], testsToRun?: TestsToRun, token?: CancellationToken, outChannel?: OutputChannel): Promise<any> {
     let testPaths = [];
@@ -25,12 +27,39 @@ export function runTest(rootDirectory: string, tests: Tests, args: string[], tes
     }
 
     let xmlLogFile = '';
-    let xmlLogFileCleanup: Function = null;
+    let xmlLogFileCleanup: Function = () => { };
 
-    return createTemporaryFile('.xml').then(xmlLogResult => {
-        xmlLogFile = xmlLogResult.filePath;
-        xmlLogFileCleanup = xmlLogResult.cleanupCallback;
-        return run(pythonSettings.unitTest.nosetestPath, args.concat(['--with-xunit', `--xunit-file=${xmlLogFile}`]).concat(testPaths), rootDirectory, token, outChannel);
+    // Check if '--with-xunit' is in args list
+    const noseTestArgs = args.slice();
+    if (noseTestArgs.indexOf(WITH_XUNIT) === -1) {
+        noseTestArgs.push(WITH_XUNIT);
+    }
+
+    // Check if '--xunit-file' exists, if not generate random xml file
+    let indexOfXUnitFile = noseTestArgs.findIndex(value => value.indexOf(XUNIT_FILE) === 0);
+    let promiseToGetXmlLogFile: Promise<string>;
+    if (indexOfXUnitFile === -1) {
+        promiseToGetXmlLogFile = createTemporaryFile('.xml').then(xmlLogResult => {
+            xmlLogFileCleanup = xmlLogResult.cleanupCallback;
+            xmlLogFile = xmlLogResult.filePath;
+
+            noseTestArgs.push(`${XUNIT_FILE}=${xmlLogFile}`);
+            return xmlLogResult.filePath;
+        });
+    }
+    else {
+        if (noseTestArgs[indexOfXUnitFile].indexOf('=') === -1) {
+            xmlLogFile = noseTestArgs[indexOfXUnitFile + 1];
+        }
+        else {
+            xmlLogFile = noseTestArgs[indexOfXUnitFile].substring(noseTestArgs[indexOfXUnitFile].indexOf('=') + 1).trim();
+        }
+
+        promiseToGetXmlLogFile = Promise.resolve(xmlLogFile);
+    }
+
+    return promiseToGetXmlLogFile.then(() => {
+        return run(pythonSettings.unitTest.nosetestPath, noseTestArgs.concat(testPaths), rootDirectory, token, outChannel);
     }).then(() => {
         return updateResultsFromLogFiles(tests, xmlLogFile);
     }).then(result => {