Fix a thread local test

- Updated conditional fact to require precise GC for the test - Fixes dotnet#57102
kouvel · Oct 26, 2021 · 17c249a · 17c249a
1 parent 9556913
commit 17c249a
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/src/libraries/System.Threading/tests/ThreadLocalTests.cs b/src/libraries/System.Threading/tests/ThreadLocalTests.cs
@@ -108,7 +108,7 @@ public static void RunThreadLocalTest4_Value_NegativeCases()
             });
         }
 
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
+        [ConditionalFact(nameof(IsThreadingAndPreciseGcSupported))]
         public static void RunThreadLocalTest5_Dispose()
         {
             // test recycling the combination index;
@@ -128,15 +128,15 @@ public static void RunThreadLocalTest5_Dispose()
             // it to be run on another thread.
             new Task(() => { threadLocal.Value = new SetMreOnFinalize(mres); }, TaskCreationOptions.LongRunning).Start(TaskScheduler.Default);
 
-            SpinWait.SpinUntil(() =>
-            {
-                GC.Collect();
-                GC.WaitForPendingFinalizers();
-                GC.Collect();
-                return mres.IsSet;
-            }, ThreadTestHelpers.UnexpectedTimeoutMilliseconds);
-
-            Assert.True(mres.IsSet);
+            ThreadTestHelpers.WaitForConditionWithCustomDelay(
+                () => mres.IsSet,
+                () =>
+                {
+                    Thread.Sleep(1);
+                    GC.Collect();
+                    GC.WaitForPendingFinalizers();
+                    GC.Collect();
+                });
         }
 
         [Fact]
@@ -478,5 +478,8 @@ public SetMreOnFinalize(ManualResetEventSlim mres)
                 _mres.Set();
             }
         }
+
+        public static bool IsThreadingAndPreciseGcSupported =>
+            PlatformDetection.IsThreadingSupported && PlatformDetection.IsPreciseGcSupported;
     }
 }