From 7e9a0357fdfe2f3862bbaeedbb75a07672b9079b Mon Sep 17 00:00:00 2001 From: kuddev Date: Wed, 23 Sep 2026 15:16:55 +0800 Subject: [PATCH] test(terminal): handle pending reads after readiness notifications --- nebula_terminal/src/tty/windows/blocking.rs | 22 +++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/nebula_terminal/src/tty/windows/blocking.rs b/nebula_terminal/src/tty/windows/blocking.rs index 9f46cec..0b5bd9e 100644 --- a/nebula_terminal/src/tty/windows/blocking.rs +++ b/nebula_terminal/src/tty/windows/blocking.rs @@ -402,6 +402,22 @@ mod tests { let event = Event::readable(KEY); let mut reader = UnblockedReader::new(ScriptedSource { rx, pending: Vec::new() }, 4096); + // Readiness permits another poll; it does not guarantee bytes. piper + // can deliberately yield for fairness and wake us again, and a queued + // notification can outlive the data that originally triggered it. + // Retry only after a notification so a genuinely lost wake still fails. + let read_chunk = |reader: &mut UnblockedReader, buf: &mut [u8]| { + let deadline = Instant::now() + Duration::from_secs(2); + loop { + let read = reader.try_read(buf); + if read > 0 { + return read; + } + assert!(Instant::now() < deadline, "readiness never produced data"); + assert!(readable_arrived(&poller, KEY), "pending read was not woken"); + } + }; + // 首次 register 自带一次无条件投递；先消化掉，后面等到的事件就只可能 // 来自 try_read 的补投。 reader.register(&poller, event, PollMode::Level); @@ -414,7 +430,8 @@ mod tests { ); let mut buf = [0u8; 64]; - assert_eq!(reader.try_read(&mut buf), 5); + assert_eq!(read_chunk(&mut reader, &mut buf), 5); + assert_eq!(&buf[..5], b"hello"); assert!(reader.pipe.is_empty(), "这一读须把管道读空，否则测不到 TOCTOU 的那一半"); assert!( @@ -427,6 +444,7 @@ mod tests { assert_eq!(reader.try_read(&mut buf), 0); tx.send(b"world".to_vec()).unwrap(); assert!(readable_arrived(&poller, KEY), "重新注册的 waker 失效，后续输出会卡住"); - assert_eq!(reader.try_read(&mut buf), 5); + assert_eq!(read_chunk(&mut reader, &mut buf), 5); + assert_eq!(&buf[..5], b"world"); } }