Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding results directory UI option in vstest task #11789

Merged
merged 16 commits into from
Nov 26, 2019
Merged

Adding results directory UI option in vstest task #11789

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c0362f6
Adding results directory UI option in vstest task
vagisha-nidhi Nov 18, 2019
0b7ae1d
Addressing comments
vagisha-nidhi Nov 18, 2019
edd21cc
Merge branch 'master' into users/vanidhi/resultdDirUI
vagisha-nidhi Nov 18, 2019
ec4bf81
Addressing PR comments
vagisha-nidhi Nov 21, 2019
9916e9c
Merge branch 'master' into users/vanidhi/resultdDirUI
vagisha-nidhi Nov 21, 2019
ca92f21
Updating test agent
vagisha-nidhi Nov 25, 2019
75da76b
Resolving conflicts
vagisha-nidhi Nov 25, 2019
8b07e21
Merge branch 'master' into users/vanidhi/resultdDirUI
vagisha-nidhi Nov 25, 2019
7c215b8
Updating test agent version
vagisha-nidhi Nov 25, 2019
dd29062
Updating relative directory and adding telemetry
vagisha-nidhi Nov 25, 2019
d66fbf6
Merge branch 'users/vanidhi/resultdDirUI' of https://github.com/vagis…
vagisha-nidhi Nov 25, 2019
14f75e8
Update task.json
vagisha-nidhi Nov 26, 2019
d592b02
Update task.json
vagisha-nidhi Nov 26, 2019
10f1b81
Merge branch 'master' into users/vanidhi/resultdDirUI
vagisha-nidhi Nov 26, 2019
03e770c
Updated help tect
vagisha-nidhi Nov 26, 2019
e69a635
Updating res.json
vagisha-nidhi Nov 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Tasks/VsTestV2/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
"loc.input.help.tcmTestRun": "Test run based selection is used when triggering automated test runs from the test hub. This option cannot be used for running tests in the CI/CD pipeline.",
"loc.input.label.searchFolder": "Search folder",
"loc.input.help.searchFolder": "Folder to search for the test assemblies.",
"loc.input.label.resultsDirectory": "Test results directory",
vagisha-nidhi marked this conversation as resolved.
Show resolved Hide resolved
"loc.input.help.resultsDirectory": "Folder to store test results. Please make sure to clean up the the results directory before running tests to remove stale results.",
"loc.input.label.testFiltercriteria": "Test filter criteria",
"loc.input.help.testFiltercriteria": "Additional criteria to filter tests from Test assemblies. For example: `Priority=1|Name=MyTestMethod`. [More information](https://msdn.microsoft.com/en-us/library/jj155796.aspx)",
"loc.input.label.runOnlyImpactedTests": "Run only impacted tests",
Expand Down
9 changes: 9 additions & 0 deletions Tasks/VsTestV2/inputparser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { AreaCodes, DistributionTypes } from './constants';
import * as idc from './inputdatacontract';
import * as Q from "q";
import * as isUncPath from 'is-unc-path';
import { stringify } from 'querystring';
vagisha-nidhi marked this conversation as resolved.
Show resolved Hide resolved
const regedit = require('regedit');

let serverBasedRun = false;
Expand Down Expand Up @@ -166,6 +167,14 @@ function getTestReportingSettings(inputDataContract : idc.InputDataContract) : i
inputDataContract.TestReportingSettings.TestRunTitle = tl.getInput('testRunTitle');
inputDataContract.TestReportingSettings.TestRunSystem = 'VSTS - vstest';

const resultsDir = tl.getInput('resultsDirectory');
if (utils.Helper.pathExistsAsDirectory(resultsDir.trim()))
vagisha-nidhi marked this conversation as resolved.
Show resolved Hide resolved
{
inputDataContract.TestReportingSettings.TestResultsDirectory = resultsDir.trim();
tl.debug("TestResultsDirectory: " + resultsDir);
ci.publishEvent({ 'TestResultsDirectoryUi': resultsDir } );
}

inputDataContract.TestReportingSettings.TestSourceSettings = <idc.TestSourceSettings>{};
inputDataContract.TestReportingSettings.TestSourceSettings.PullRequestTargetBranchName = tl.getVariable('System.PullRequest.TargetBranch');
inputDataContract.TestReportingSettings.ExecutionStatusSettings = <idc.ExecutionStatusSettings>{};
Expand Down
13 changes: 11 additions & 2 deletions Tasks/VsTestV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 161,
"Patch": 1
"Minor": 162,
"Patch": 0
},
"demands": [
"vstest"
Expand Down Expand Up @@ -145,6 +145,15 @@
"helpMarkDown": "Folder to search for the test assemblies.",
"groupName": "testSelection"
},
{
"name": "resultsDirectory",
"type": "string",
"label": "Test results directory",
"defaultValue": "",
vagisha-nidhi marked this conversation as resolved.
Show resolved Hide resolved
"required": false,
"helpMarkDown": "Folder to store test results. Please make sure to clean up the the results directory before running tests to remove stale results.",
"groupName": "testSelection"
},
{
"name": "testFiltercriteria",
"type": "string",
Expand Down
13 changes: 11 additions & 2 deletions Tasks/VsTestV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 161,
"Patch": 1
"Minor": 162,
"Patch": 0
},
"demands": [
"vstest"
Expand Down Expand Up @@ -145,6 +145,15 @@
"helpMarkDown": "ms-resource:loc.input.help.searchFolder",
"groupName": "testSelection"
},
{
"name": "resultsDirectory",
"type": "string",
"label": "ms-resource:loc.input.label.resultsDirectory",
"defaultValue": "",
"required": false,
"helpMarkDown": "ms-resource:loc.input.help.resultsDirectory",
"groupName": "testSelection"
},
{
"name": "testFiltercriteria",
"type": "string",
Expand Down