From 3b36c286949bcb571ff5b5a818ab4f111589673c Mon Sep 17 00:00:00 2001
From: haranishi <223786623+haranishi@users.noreply.github.com>
Date: Tue, 13 Oct 2026 18:25:53 +0900
Subject: [PATCH] =?UTF-8?q?test:=20macOS=E3=81=AEMCP=E5=86=8D=E6=8E=A5?=
 =?UTF-8?q?=E7=B6=9A=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE=E3=82=BD=E3=82=B1?=
 =?UTF-8?q?=E3=83=83=E3=83=88=E8=A8=AD=E5=AE=9A=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crates/mcp/src/backend.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crates/mcp/src/backend.rs b/crates/mcp/src/backend.rs
index debdbb12..ca4f588d 100644
--- a/crates/mcp/src/backend.rs
+++ b/crates/mcp/src/backend.rs
@@ -172,6 +172,9 @@ mod tests {
                     Err(e) => panic!("accept failed: {e}"),
                 }
             };
+            // Accepted sockets can inherit the listener's nonblocking mode. The server
+            // waits for both requests with timeouts, rather than reading before they arrive.
+            stream.set_nonblocking(false).unwrap();
             stream.set_read_timeout(Some(Duration::from_secs(2))).unwrap();
             stream.set_write_timeout(Some(Duration::from_secs(2))).unwrap();
             let mut reader = BufReader::new(stream.try_clone().unwrap());