Skip to content

Mitigate macOS FSEvents race in TokensFiredForNewDirectoryContentsOnRename #135342

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

Draft
svick wants to merge 4 commits into
base: main
Choose a base branch
from
+8 −1
Draft

Mitigate macOS FSEvents race in TokensFiredForNewDirectoryContentsOnRename #135342

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9060932
Mitigate macOS FSEvents race in TokensFiredForNewDirectoryContentsOnR…
svick Oct 7, 2026
ef50c02
Use [ConditionalFact] so SkipTestException is honored as a skip
svick Oct 8, 2026
7701404
Merge remote-tracking branch 'origin/main' into fix-filewatcher-macos…
svick Oct 8, 2026
06838f9
Replace delay+skip mitigation with a deterministic Filter-based fix
svick Oct 8, 2026
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
9 changes: 8 additions & 1 deletion src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/PhysicalFileProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ public async Task TokensFiredForOldAndNewNamesOnRename()
}
}

[Fact]
[ConditionalFact]
[SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.Wasi | TestPlatforms.iOS | TestPlatforms.tvOS, "System.IO.FileSystem.Watcher is not supported on Browser/WASI/iOS/tvOS")]
public async Task TokensFiredForNewDirectoryContentsOnRename()
{
Expand All @@ -1270,6 +1270,13 @@ void Fail(object state)
using (var physicalFilesWatcher = new PhysicalFilesWatcher(root.Path + Path.DirectorySeparatorChar, fileSystemWatcher, pollForChanges: false))
using (var provider = new PhysicalFileProvider(root.Path) { FileWatcher = physicalFilesWatcher })
{
// This test only relies on the watcher events that are injected below via
// fileSystemWatcher.CallOnRenamed, which invokes FileSystemWatcher.OnRenamed directly and
// so bypasses Filter matching. Setting a Filter that cannot match any of the (randomly
// generated) names used by this test suppresses any genuine native events - e.g. ones
// belatedly reported by macOS fseventsd for the directory/file creation below.
fileSystemWatcher.Filter = "this-filter-does-not-match-anything";

var oldDirectoryName = Guid.NewGuid().ToString();
var oldSubDirectoryName = Guid.NewGuid().ToString();
var oldSubDirectoryPath = Path.Combine(oldDirectoryName, oldSubDirectoryName);
Expand Down