From 81c255371e6046cfff53ccc2a7eceaf2e83a06d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?= <me@jakubjares.com>
Date: Sat, 23 May 2026 03:39:46 +0200
Subject: [PATCH 1/2] Fix flaky EnableLoggersArgumentProcessorTests by
 resetting RunSettingsManager

The test class uses RunSettingsManager.Instance (a static singleton) but
did not reset it between tests, causing potential cross-test contamination
on macOS where test execution order may differ.

Add TestInitialize reset and TestCleanup to ensure each test starts with
and leaves behind a clean RunSettingsManager state. This matches the
existing pattern in RunSettingsManagerTests.cs.

Fixes #15614

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Processors/EnableLoggersArgumentProcessorTests.cs      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/vstest.console.UnitTests/Processors/EnableLoggersArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/EnableLoggersArgumentProcessorTests.cs
index bda4a022a6..df6f93887f 100644
--- a/test/vstest.console.UnitTests/Processors/EnableLoggersArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/EnableLoggersArgumentProcessorTests.cs
@@ -21,6 +21,13 @@ public class EnableLoggersArgumentProcessorTests
     public void Initialize()
     {
         RunTestsArgumentProcessorTests.SetupMockExtensions();
+        RunSettingsManager.Instance = null;
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        RunSettingsManager.Instance = null;
     }
 
     [TestMethod]

From 76370d2b02fa7ef6445320126201bc783760a694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?= <me@jakubjares.com>
Date: Mon, 25 May 2026 08:04:14 +0200
Subject: [PATCH 2/2] Reorder: reset RunSettingsManager before
 SetupMockExtensions in TestInitialize

Ensure clean state before setting up mocks, not after.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Processors/EnableLoggersArgumentProcessorTests.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/vstest.console.UnitTests/Processors/EnableLoggersArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/EnableLoggersArgumentProcessorTests.cs
index df6f93887f..8555b3cca7 100644
--- a/test/vstest.console.UnitTests/Processors/EnableLoggersArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/EnableLoggersArgumentProcessorTests.cs
@@ -20,8 +20,8 @@ public class EnableLoggersArgumentProcessorTests
     [TestInitialize]
     public void Initialize()
     {
-        RunTestsArgumentProcessorTests.SetupMockExtensions();
         RunSettingsManager.Instance = null;
+        RunTestsArgumentProcessorTests.SetupMockExtensions();
     }
 
     [TestCleanup]