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

RunInParallel properly set when in the runsetting even if it set to d… #4116

Merged
merged 3 commits into from
Apr 25, 2017
Merged

RunInParallel properly set when in the runsetting even if it set to d… #4116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5376ed3
RunInParallel properly set when in the runsetting even if it set to d…
RanjanarMS Apr 25, 2017
bb7d473
Code review comments taken care
RanjanarMS Apr 25, 2017
46ea391
Merge branch 'master' into users/ranjanar/runInParallelBug
RanjanarMS Apr 25, 2017
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: 1 addition & 1 deletion Tasks/VsTest/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"loc.input.label.overrideTestrunParameters": "Override test run parameters",
"loc.input.help.overrideTestrunParameters": "Override parameters defined in the TestRunParameters section of runsettings file. For example: `-key1 value1 -key2 value2`",
"loc.input.label.runInParallel": "Run tests in parallel on multi-core machines",
"loc.input.help.runInParallel": "If set, tests will run in parallel leveraging available cores of the machine. [Click here](https://aka.ms/paralleltestexecution) to learn more about how tests are run in parallel.",
"loc.input.help.runInParallel": "If set, tests will run in parallel leveraging available cores of the machine. This will override the MaxCpuCount if specified in your runsettings file. [Click here](https://aka.ms/paralleltestexecution) to learn more about how tests are run in parallel.",
"loc.input.label.runTestsInIsolation": "Run tests in isolation",
"loc.input.help.runTestsInIsolation": "Runs the tests in an isolated process. This makes vstest.console.exe process less likely to be stopped on an error in the tests, but tests might run slower. This option currently cannot be used when running with the multi-agent phase setting.",
"loc.input.label.pathtoCustomTestAdapters": "Path to custom test adapters",
Expand Down
267 changes: 127 additions & 140 deletions Tasks/VsTest/settingshelper.ts
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Tasks/VsTest/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"version": {
"Major": 2,
"Minor": 0,
"Patch": 35
"Patch": 36
},
"demands": [
"vstest"
Expand Down Expand Up @@ -238,7 +238,7 @@
"label": "Run tests in parallel on multi-core machines",
"defaultValue": "False",
"required": false,
"helpMarkDown": "If set, tests will run in parallel leveraging available cores of the machine. [Click here](https://aka.ms/paralleltestexecution) to learn more about how tests are run in parallel.",
"helpMarkDown": "If set, tests will run in parallel leveraging available cores of the machine. This will override the MaxCpuCount if specified in your runsettings file. [Click here](https://aka.ms/paralleltestexecution) to learn more about how tests are run in parallel.",
"groupName": "executionOptions"
},
{
Expand Down
2 changes: 1 addition & 1 deletion Tasks/VsTest/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"version": {
"Major": 2,
"Minor": 0,
"Patch": 35
"Patch": 36
},
"demands": [
"vstest"
Expand Down
202 changes: 143 additions & 59 deletions Tests-Legacy/L0/VsTest/_suite.ts
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions Tests-Legacy/L0/VsTest/data/Invalid.runsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<InvalidRunSettings>
<RunConfiguration>
<ResultsDirectory>C:\test</ResultsDirectory>
</RunConfiguration>
</InvalidRunSettings>
27 changes: 27 additions & 0 deletions Tests-Legacy/L0/VsTest/data/ValidWithMaxCpuCountAs1.runsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<RunSettings>
<!-- Configurations that affect the Test Framework -->
<RunConfiguration>
<MaxCpuCount>1</MaxCpuCount>
<!-- Path relative to solution directory -->
<ResultsDirectory>.\TestResults</ResultsDirectory>

<!-- [x86] | x64
- You can also change it from menu Test, Test Settings, Default Processor Architecture -->
<TargetPlatform>x86</TargetPlatform>

<!-- Framework35 | [Framework40] | Framework45 -->
<TargetFrameworkVersion>Framework40</TargetFrameworkVersion>

<!-- Path to Test Adapters -->
<TestAdaptersPaths>%SystemDrive%\Temp\foo;%SystemDrive%\Temp\bar</TestAdaptersPaths>
</RunConfiguration>

<!-- Parameters used by tests at runtime -->
<TestRunParameters>
<Parameter name="webAppUrl" value="http://localhost" />
<Parameter name="-webAppUserName" value="Admin" />
<Parameter name="webAppPassword" value="Password" />
</TestRunParameters>

</RunSettings>
26 changes: 26 additions & 0 deletions Tests-Legacy/L0/VsTest/data/ValidWithoutMaxCpuCountNode.runsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<RunSettings>
<!-- Configurations that affect the Test Framework -->
<RunConfiguration>
<!-- Path relative to solution directory -->
<ResultsDirectory>.\TestResults</ResultsDirectory>

<!-- [x86] | x64
- You can also change it from menu Test, Test Settings, Default Processor Architecture -->
<TargetPlatform>x86</TargetPlatform>

<!-- Framework35 | [Framework40] | Framework45 -->
<TargetFrameworkVersion>Framework40</TargetFrameworkVersion>

<!-- Path to Test Adapters -->
<TestAdaptersPaths>%SystemDrive%\Temp\foo;%SystemDrive%\Temp\bar</TestAdaptersPaths>
</RunConfiguration>

<!-- Parameters used by tests at runtime -->
<TestRunParameters>
<Parameter name="webAppUrl" value="http://localhost" />
<Parameter name="-webAppUserName" value="Admin" />
<Parameter name="webAppPassword" value="Password" />
</TestRunParameters>

</RunSettings>
8 changes: 8 additions & 0 deletions Tests-Legacy/L0/VsTest/data/ValidWithoutRunConfiguration.runsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RunSettings>
<TestRunParameters>
<Parameter name="webAppUrl" value="http://localhost" />
<Parameter name="-webAppUserName" value="Admin" />
<Parameter name="webAppPassword" value="Password" />
</TestRunParameters>
</RunSettings>