From 5914ccdc510d5641c63eb9ead2664e040bb42e48 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Thu, 30 Jan 2025 23:53:36 -0700 Subject: [PATCH] Deflake fs::test_event_stream_simple (#24013) Should reduce test flakiness Release Notes: - N/A --- crates/fsevent/src/fsevent.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/crates/fsevent/src/fsevent.rs b/crates/fsevent/src/fsevent.rs index 533bb90979..c0ab728066 100644 --- a/crates/fsevent/src/fsevent.rs +++ b/crates/fsevent/src/fsevent.rs @@ -398,8 +398,15 @@ mod tests { assert!(event.flags.contains(StreamFlags::ITEM_CREATED)); fs::remove_file(path.join("existing-file-5")).unwrap(); - let events = rx.recv_timeout(Duration::from_secs(2)).unwrap(); - let event = events.last().unwrap(); + let mut events = rx.recv_timeout(Duration::from_secs(2)).unwrap(); + let mut event = events.last().unwrap(); + // we see this duplicate about 1/100 test runs. + if event.path == path.join("new-file") + && event.flags.contains(StreamFlags::ITEM_CREATED) + { + events = rx.recv_timeout(Duration::from_secs(2)).unwrap(); + event = events.last().unwrap(); + } assert_eq!(event.path, path.join("existing-file-5")); assert!(event.flags.contains(StreamFlags::ITEM_REMOVED)); drop(handle);