Fix race condition with multithreaded tests.

OmniSharp · Jul 21, 2022 · 579814f · 579814f
1 parent eb26f15
commit 579814f
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/CompletionFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/CompletionFacts.cs
@@ -2301,7 +2301,12 @@ private OmniSharpTestHost GetImportCompletionHost()
             {
                 var testHost = CreateOmniSharpHost(configurationData: new[] { new KeyValuePair<string, string>("RoslynExtensionsOptions:EnableImportCompletion", "true") });
                 testHost.AddFilesToWorkspace();
-                _completionFixture.ImportCompletionTestHost = testHost;
+                var result = Interlocked.CompareExchange(ref _completionFixture.ImportCompletionTestHost, testHost, null);
+                if (result != null)
+                {
+                    testHost.Dispose();
+                    testHost = result;
+                }
                 return testHost;
             }
         }
@@ -2319,7 +2324,12 @@ private OmniSharpTestHost GetAsyncCompletionAndImportCompletionHost()
                     new KeyValuePair<string, string>("RoslynExtensionsOptions:EnableAsyncCompletion", "true"),
                 });
                 testHost.AddFilesToWorkspace();
-                _completionFixture.ImportAndAsyncCompletionTestHost = testHost;
+                var result = Interlocked.CompareExchange(ref _completionFixture.ImportCompletionTestHost, testHost, null);
+                if (result != null)
+                {
+                    testHost.Dispose();
+                    testHost = result;
+                }
                 return testHost;
             }
         }
@@ -2352,8 +2362,8 @@ internal static class CompletionResponseExtensions
 #nullable enable
     public sealed class CompletionFixture : IDisposable
     {
-        public OmniSharpTestHost? ImportCompletionTestHost { get; set; }
-        public OmniSharpTestHost? ImportAndAsyncCompletionTestHost { get; set; }
+        public OmniSharpTestHost? ImportCompletionTestHost;
+        public OmniSharpTestHost? ImportAndAsyncCompletionTestHost;
 
         public void Dispose()
         {