aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-02-15 13:17:09 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-02-15 13:17:09 +0000
commitc06f5d497979535f6e4b3ff1ca44972415e7ebed (patch)
treef76e531acbfa048f9ca61eb490799d3250e3111a
parentda04eb3770eb14dadb6a2904269fe1ea0aef987f (diff)
parentcc15d3613c64c8881ea8aa81f5b9f6f1d89fb64d (diff)
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]>
-rw-r--r--crates/ra_vfs/tests/vfs.rs2
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<()> {
83 } 83 }
84 84
85 // rust-analyzer#734: fsevents has a bunch of events still sitting around. 85 // rust-analyzer#734: fsevents has a bunch of events still sitting around.
86 process_tasks_in_range(&mut vfs, 0, 7); 86 process_tasks_in_range(&mut vfs, 0, if cfg!(target_os = "macos") { 7 } else { 0 });
87 match vfs.commit_changes().as_slice() { 87 match vfs.commit_changes().as_slice() {
88 [] => {} 88 [] => {}
89 89