Skip to content

Fix flaky TestResourceManagerIsSafeForConcurrentAccessAndEnumeration timeout #125573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmoseley merged 1 commit into from
Mar 16, 2026
+5 −2
Merged

Fix flaky TestResourceManagerIsSafeForConcurrentAccessAndEnumeration timeout #125573

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/libraries/System.Resources.Extensions/tests/BinaryResourceWriterUnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ public static void EmbeddedResourcesAreUpToDate()
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
[InlineData(false)]
[InlineData(true)]
public static void TestResourceManagerIsSafeForConcurrentAccessAndEnumeration(bool useEnumeratorEntry)
public static async Task TestResourceManagerIsSafeForConcurrentAccessAndEnumeration(bool useEnumeratorEntry)
{
ResourceManager manager = new(
typeof(TestData).FullName,
Expand All @@ -534,7 +534,10 @@ public static void TestResourceManagerIsSafeForConcurrentAccessAndEnumeration(bo
TaskScheduler.Default))
.ToArray();

Assert.True(Task.WaitAll(tasks, TimeSpan.FromSeconds(30)));
Task allTasks = Task.WhenAll(tasks);
Task completed = await Task.WhenAny(allTasks, Task.Delay(TimeSpan.FromSeconds(120)));
Assert.True(completed == allTasks, "Timed out waiting for concurrent enumeration tasks");
await allTasks; // propagates any real exceptions

void WaitForBarrierThenEnumerateResources()
{
Expand Down
Loading