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

Jump to bottom

Don't parallelize default platform tests #3849

Merged
merged 3 commits into from
Jul 19, 2022
Merged

Don't parallelize default platform tests #3849

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8008b0f
Don't parallelize default platform tests
nohwnd Jul 13, 2022
41bc6d5
Update test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestM…
nohwnd Jul 19, 2022
62f9950
Fix whitespace
nohwnd Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/build/TestPlatform.Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-- this version also needs to be "statically" readable because the test fixture will inspect this file for the version
and because during the test `dotnet test` will run and re-build some of the test projects and at that time the version
from a build parameter would not be available, so I am writing this version from the build.ps1 script to keep it in sync -->
<NETTestSdkVersion>17.3.0-dev</NETTestSdkVersion>
<NETTestSdkVersion>17.4.0-dev</NETTestSdkVersion>

<!-- These versions are used for running unit tests, and running acceptance tests. They are also used as the default version for projects
in TestAssets.sln to allow running and debugging tests in that solution directly in VS without having to run them via AcceptanceTests. -->
Expand Down
6 changes: 6 additions & 0 deletions test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
using Microsoft.VisualStudio.TestTools.UnitTesting;

using Moq;
Expand Down Expand Up @@ -2578,9 +2579,14 @@ private void DiscoverTestsIfThrowsExceptionShouldThrowOut(Exception exception)
[DataRow("x86")]
[DataRow("x64")]
[DataRow("arm64")]
// Don't parallelize because we can run into conflict with GetDefaultArchitecture -> RunSettingsHelper.Instance.IsDefaultTargetArchitecture
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we rework the static so that the test can be run in parallel?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, if we do the work to populate the attribute on the actual runsettings text and read it from there.

// which is set by some other test.
[DoNotParallelize()]
nohwnd marked this conversation as resolved.
Show resolved Hide resolved
public void SettingDefaultPlatformUsesItForAnyCPUSourceButNotForNonAnyCPUSource(string defaultPlatform)
{
// -- Arrange

RunSettingsHelper.Instance.IsDefaultTargetArchitecture = true;
var payload = new DiscoveryRequestPayload()
{
Sources = new List<string>() { "AnyCPU.dll", "x64.dll" },
Expand Down