Merge #830

830: Fix test_vfs_works failing on Windows due to extra Write events r=pnkfelix a=vipentti

On Windows `notify` generates extra `Write` events for folders, which caused
`process_tasks` to not handle all tasks generated on Windows.

This fixes #827

Co-authored-by: Ville Penttinen <[email protected]>

1 files changed, 3 insertions, 1 deletions

diff --git a/crates/ra_vfs/tests/vfs.rs b/crates/ra_vfs/tests/vfs.rs
index c76e6ea26..b31e0f288 100644
--- a/crates/ra_vfs/tests/vfs.rs
+++ b/crates/ra_vfs/tests/vfs.rs
@@ -118,7 +118,9 @@ fn test_vfs_works() -> std::io::Result<()> {
 
     fs::rename(&dir.path().join("a/sub1/sub2/new.rs"), &dir.path().join("a/sub1/sub2/new1.rs"))
         .unwrap();
-    process_tasks(&mut vfs, 2);
+    // NOTE: Windows generates extra `Write` events when renaming?
+    // meaning we have extra tasks to process
+    process_tasks(&mut vfs, if cfg!(windows) { 4 } else { 2 });
     assert_match!(
         vfs.commit_changes().as_slice(),
         [VfsChange::RemoveFile { path: removed_path, .. }, VfsChange::AddFile { text, path: added_path, .. }],