diff --git a/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs b/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs index b31509790f..7dfa8e2aab 100644 --- a/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs +++ b/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs @@ -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; @@ -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 + // which is set by some other test. + [DoNotParallelize] public void SettingDefaultPlatformUsesItForAnyCPUSourceButNotForNonAnyCPUSource(string defaultPlatform) { // -- Arrange + + RunSettingsHelper.Instance.IsDefaultTargetArchitecture = true; var payload = new DiscoveryRequestPayload() { Sources = new List() { "AnyCPU.dll", "x64.dll" },