fix plus tests #1886
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,8 +10,8 @@ var fs = require('fs'); | |
| var xml2js = require('xml2js'); | ||
|
|
||
| try { | ||
| tl.setResourcePath(path.join(__dirname, 'task.json')); | ||
|
|
||
| var vsTestVersion: string = tl.getInput('vsTestVersion'); | ||
| var testAssembly: string = tl.getInput('testAssembly', true); | ||
| var testFiltercriteria: string = tl.getInput('testFiltercriteria'); | ||
|
|
@@ -53,7 +53,7 @@ try { | |
| } | ||
| else { | ||
| tl._writeLine("##vso[task.logissue type=warning;code=002004;]"); | ||
| tl.warning(tl.loc('NoMatchingTestAssemblies', testAssembly)); | ||
| } | ||
| } | ||
| catch (error) { | ||
|
|
@@ -108,8 +108,13 @@ function invokeVSTest(testResultsDirectory: string): Q.Promise<number> { | |
| setRunInParallellIfApplicable(vsVersion); | ||
| setupRunSettingsFileForParallel(runInParallel, overriddenSettingsFile) | ||
| .then(function(parallelRunSettingsFile) { | ||
| var vstestPath = tl.getVariable("VSTest_" + vsVersion.toFixed(1)); | ||
| if (!vstestPath) { | ||
| tl.warning(tl.loc('VstestNotFound', vsVersion)); | ||
| defer.resolve(1); | ||
|
There was a problem hiding this comment. 1 means task fails There was a problem hiding this comment. |
||
| return defer.promise; | ||
| } | ||
| var vstestLocation = path.join(vstestPath, "vstest.console.exe"); | ||
| var vstest = tl.createToolRunner(vstestLocation); | ||
|
|
||
| testAssemblyFiles.forEach(function(testAssembly) { | ||
|
|
@@ -164,7 +169,7 @@ function invokeVSTest(testResultsDirectory: string): Q.Promise<number> { | |
| }) | ||
| .fail(function(err) { | ||
| cleanUp(parallelRunSettingsFile); | ||
| tl.warning(tl.loc('VstestFailed')); | ||
| tl.error(err); | ||
| defer.resolve(1); | ||
| }); | ||
|
|
@@ -197,7 +202,7 @@ function publishTestResults(testResultsDirectory: string) { | |
| } | ||
| else { | ||
| tl._writeLine("##vso[task.logissue type=warning;code=002003;]"); | ||
| tl.warning(tl.loc('NoResultsToPublish')); | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -214,7 +219,12 @@ function getFilteredFiles(filesFilter: string, allFiles: string[]): string[] { | |
| function cleanUp(temporarySettingsFile: string) { | ||
| //cleanup the runsettings file | ||
| if (temporarySettingsFile && runSettingsFile != temporarySettingsFile) { | ||
| try { | ||
| tl.rmRF(temporarySettingsFile, true); | ||
| } | ||
| catch (error) { | ||
| //ignore. just cleanup. | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -245,7 +255,7 @@ function overrideTestRunParametersIfRequired(settingsFile: string): Q.Promise<st | |
| var parser = new xml2js.Parser(); | ||
| parser.parseString(xmlContents, function(err, result) { | ||
| if (err) { | ||
| tl.warning(tl.loc('ErrorWhileReadingRunSettings', err)); | ||
| tl.debug("Error occured while overriding test run parameters. Continuing..."); | ||
| defer.resolve(settingsFile); | ||
| return defer.promise; | ||
|
|
@@ -337,7 +347,7 @@ function setupRunSettingsFileForParallel(runInParallel: boolean, settingsFile: s | |
| var defer = Q.defer<string>(); | ||
| if (runInParallel) { | ||
| if (settingsFile && settingsFile.split('.').pop().toLowerCase() == "testsettings") { | ||
| tl.warning(tl.loc('RunInParallelNotSupported')); | ||
| defer.resolve(settingsFile); | ||
| return defer.promise; | ||
| } | ||
|
|
@@ -363,14 +373,14 @@ function setupRunSettingsFileForParallel(runInParallel: boolean, settingsFile: s | |
| var parser = new xml2js.Parser(); | ||
| parser.parseString(xmlContents, function(err, result) { | ||
| if (err) { | ||
| tl.warning(tl.loc('ErrorWhileReadingRunSettings', err)); | ||
| tl.debug("Error occured while setting run in parallel. Continuing..."); | ||
| defer.resolve(settingsFile); | ||
| return defer.promise; | ||
| } | ||
|
|
||
| if (result.RunSettings === undefined) { | ||
| tl.warning(tl.loc('FailedToSetRunInParallel')); | ||
| defer.resolve(settingsFile); | ||
| return defer.promise; | ||
| } | ||
|
|
@@ -432,16 +442,17 @@ function setRunInParallellIfApplicable(vsVersion: number) { | |
| if (runInParallel) { | ||
| if (!isNaN(vsVersion) && vsVersion >= 14) { | ||
| var vs14Common = tl.getVariable("VS140COMNTools"); | ||
| if (vsVersion > 14 || (vs14Common && pathExistsAsFile(path.join(vs14Common, "..\\IDE\\CommonExtensions\\Microsoft\\TestWindow\\TE.TestModes.dll")))) { | ||
|
There was a problem hiding this comment. this dll determines if it is below update 1 There was a problem hiding this comment. and we r sure it wont be removed going forward? we cant guarantee that correct? In reply to: 67283885 [](ancestors = 67283885) |
||
| setRegistryKeyForParallelExecution(vsVersion); | ||
| return; | ||
| } | ||
| } | ||
| resetRunInParallel(); | ||
| } | ||
| } | ||
|
|
||
| function resetRunInParallel() { | ||
| tl.warning(tl.loc('UpdateOneOrHigherRequired')); | ||
| runInParallel = false; | ||
| } | ||
|
|
||
|
|
@@ -497,11 +508,11 @@ function setRegistryKeyForParallelExecution(vsVersion: number) { | |
| }; | ||
| regedit.putValue(values, function(err) { | ||
| if (err) { | ||
| tl.warning(tl.loc('ErrorOccuredWhileSettingRegistry', err)); | ||
| } | ||
| }); | ||
| } else { | ||
| tl.warning(tl.loc('ErrorOccuredWhileSettingRegistry', err)); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
will change