From 6fb57ea0516f469a2242c21c2d3481c2ed37555e Mon Sep 17 00:00:00 2001 From: Evangelink Date: Sat, 16 May 2026 16:35:27 +0200 Subject: [PATCH 1/2] Serialize TelemetryTests to fix VSTest_RunTests_Succeeds flake Acceptance tests run with assembly-level method parallelization. The two VSTest_* methods both invoke 'dotnet test' against the shared VSTestProjectPath, so concurrent invocations for the same TFM race on obj/Release//TelemetryVSTestProject.dll and one fails with CS2012. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../MSTest.Acceptance.IntegrationTests/TelemetryTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/TelemetryTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/TelemetryTests.cs index b09a2e72cb..2ee3d39c24 100644 --- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/TelemetryTests.cs +++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/TelemetryTests.cs @@ -8,6 +8,7 @@ namespace MSTest.Acceptance.IntegrationTests; [TestClass] +[DoNotParallelize] // VSTest tests rebuild the shared VSTestProjectPath; running them in parallel races on obj/Release//. public sealed class TelemetryTests : AcceptanceTestBase { private const string MTPAssetName = "TelemetryMTPProject"; From 3989912d2a513e94a066c8f8c92009dfa634e85c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 17 May 2026 19:20:43 +0000 Subject: [PATCH 2/2] Resolve TelemetryTests merge markers Co-authored-by: Evangelink <11340282+Evangelink@users.noreply.github.com> --- .../MSTest.Acceptance.IntegrationTests/TelemetryTests.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/TelemetryTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/TelemetryTests.cs index b3ad54bfb4..9d8fc98e34 100644 --- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/TelemetryTests.cs +++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/TelemetryTests.cs @@ -8,16 +8,12 @@ namespace MSTest.Acceptance.IntegrationTests; [TestClass] -<<<<<<< HEAD -[DoNotParallelize] // VSTest tests rebuild the shared VSTestProjectPath; running them in parallel races on obj/Release//. -======= // The VSTest_* tests below invoke `dotnet test` against the same shared VSTest project // path for every target framework. Running them in parallel races on MSBuild outputs // such as `bin/Release//TelemetryVSTestProject.runtimeconfig.json` and shared // `obj/` files, which causes intermittent `GenerateRuntimeConfigurationFiles` failures. // Serialize all tests in this class to keep the suite deterministic. [DoNotParallelize] ->>>>>>> origin/main public sealed class TelemetryTests : AcceptanceTestBase { private const string MTPAssetName = "TelemetryMTPProject";