Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Allow WebSocket test server shutdown while waiting for requests (#47698)

jgershen-oai4b3b569f3975
diff --git a/codex-rs/core/tests/common/responses.rs b/codex-rs/core/tests/common/responses.rs
index 5c65a36ade..60d8878919 100644
--- a/codex-rs/core/tests/common/responses.rs
+++ b/codex-rs/core/tests/common/responses.rs
@@ -1311,7 +1311,11 @@ pub async fn start_websocket_server_with_headers(
};
let close_after_requests = connection.close_after_requests;
for request_events in connection.requests {
- let Some(Ok(message)) = ws_stream.next().await else {
+ let message = tokio::select! {
+ _ = &mut shutdown_rx => return,
+ message = ws_stream.next() => message,
+ };
+ let Some(Ok(message)) = message else {
break;
};
if let Some(body) = parse_ws_request_body(message) {