Don't parallelize default platform tests (#3849)

Co-authored-by: Amaury Levé <amaury.leve@gmail.com>
microsoft · Jul 19, 2022 · e85a600 · e85a600
1 parent 63fe52a
commit e85a600
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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<string>() { "AnyCPU.dll", "x64.dll" },