Merge #838

838: Dont slow down everyone else's testing (especially the CI) just for Mac OS X r=matklad a=pnkfelix

The allowance for up to 7 events, and thus requiring anyone with fewer than 7 events to wait for the 3 second timeout, is only relevant to fsevents (i.e. Mac OS X)

Co-authored-by: Felix S. Klock II <[email protected]>

1 files changed, 1 insertions, 1 deletions

diff --git a/crates/ra_vfs/tests/vfs.rs b/crates/ra_vfs/tests/vfs.rs
index 2ae7bb40b..200a03e54 100644
--- a/crates/ra_vfs/tests/vfs.rs
+++ b/crates/ra_vfs/tests/vfs.rs
@@ -83,7 +83,7 @@ fn test_vfs_works() -> std::io::Result<()> {
     }
 
     // rust-analyzer#734: fsevents has a bunch of events still sitting around.
-    process_tasks_in_range(&mut vfs, 0, 7);
+    process_tasks_in_range(&mut vfs, 0, if cfg!(target_os = "macos") { 7 } else { 0 });
     match vfs.commit_changes().as_slice() {
         [] => {}