From 65c80faaf5bf3818c1feff5361690fa82eaf77df Mon Sep 17 00:00:00 2001 From: Michael Zeng Date: Mon, 11 May 2026 15:31:01 -0700 Subject: [PATCH] [exec-server] remove added HTTP upgrade tests --- .../exec-server/src/server/transport_tests.rs | 24 ------------- .../exec-server/tests/common/exec_server.rs | 36 +++---------------- codex-rs/exec-server/tests/health.rs | 30 ---------------- 3 files changed, 5 insertions(+), 85 deletions(-) delete mode 100644 codex-rs/exec-server/tests/health.rs diff --git a/codex-rs/exec-server/src/server/transport_tests.rs b/codex-rs/exec-server/src/server/transport_tests.rs index 6916450a91..26cbdf1a40 100644 --- a/codex-rs/exec-server/src/server/transport_tests.rs +++ b/codex-rs/exec-server/src/server/transport_tests.rs @@ -125,20 +125,6 @@ fn parse_listen_url_accepts_websocket_url() { ); } -#[test] -fn parse_listen_url_accepts_http_upgrade_websocket_url() { - let transport = parse_listen_url("ws+http://127.0.0.1:1234") - .expect("HTTP-upgrade websocket listen URL should parse"); - assert_eq!( - transport, - ExecServerListenTransport::HttpUpgradeWebSocket( - "127.0.0.1:1234" - .parse::() - .expect("valid socket address") - ) - ); -} - #[test] fn parse_listen_url_rejects_invalid_websocket_url() { let err = parse_listen_url("ws://localhost:1234") @@ -149,16 +135,6 @@ fn parse_listen_url_rejects_invalid_websocket_url() { ); } -#[test] -fn parse_listen_url_rejects_invalid_http_upgrade_websocket_url() { - let err = parse_listen_url("ws+http://localhost:1234") - .expect_err("hostname bind address should be rejected"); - assert_eq!( - err.to_string(), - "invalid websocket --listen URL `ws+http://localhost:1234`; expected `ws://IP:PORT` or `ws+http://IP:PORT`" - ); -} - #[test] fn parse_listen_url_rejects_unsupported_url() { let err = diff --git a/codex-rs/exec-server/tests/common/exec_server.rs b/codex-rs/exec-server/tests/common/exec_server.rs index 0fc95dfbbb..4ff7408715 100644 --- a/codex-rs/exec-server/tests/common/exec_server.rs +++ b/codex-rs/exec-server/tests/common/exec_server.rs @@ -57,28 +57,10 @@ pub(crate) fn test_codex_helper_paths() -> anyhow::Result } pub(crate) async fn exec_server() -> anyhow::Result { - exec_server_with_listen_url_and_env("ws://127.0.0.1:0", std::iter::empty::<(&str, &str)>()) - .await -} - -pub(crate) async fn http_exec_server() -> anyhow::Result { - exec_server_with_listen_url_and_env("ws+http://127.0.0.1:0", std::iter::empty::<(&str, &str)>()) - .await + exec_server_with_env(std::iter::empty::<(&str, &str)>()).await } pub(crate) async fn exec_server_with_env(env: I) -> anyhow::Result -where - I: IntoIterator, - K: AsRef, - V: AsRef, -{ - exec_server_with_listen_url_and_env("ws://127.0.0.1:0", env).await -} - -async fn exec_server_with_listen_url_and_env( - listen_url: &str, - env: I, -) -> anyhow::Result where I: IntoIterator, K: AsRef, @@ -87,7 +69,7 @@ where let helper_paths = test_codex_helper_paths()?; let codex_home = TempDir::new()?; let mut child = Command::new(&helper_paths.codex_exe); - child.args(["exec-server", "--listen", listen_url]); + child.args(["exec-server", "--listen", "ws://127.0.0.1:0"]); child.stdin(Stdio::null()); child.stdout(Stdio::piped()); child.stderr(Stdio::inherit()); @@ -97,8 +79,7 @@ where let mut child = child.spawn()?; let websocket_url = read_listen_url_from_stdout(&mut child).await?; - let (websocket, _) = - connect_websocket_when_ready(&websocket_connect_url(&websocket_url)).await?; + let (websocket, _) = connect_websocket_when_ready(&websocket_url).await?; Ok(ExecServerHarness { _codex_home: codex_home, _helper_paths: helper_paths, @@ -120,8 +101,7 @@ impl ExecServerHarness { } pub(crate) async fn reconnect_websocket(&mut self) -> anyhow::Result<()> { - let (websocket, _) = - connect_websocket_when_ready(&websocket_connect_url(&self.websocket_url)).await?; + let (websocket, _) = connect_websocket_when_ready(&self.websocket_url).await?; self.websocket = websocket; Ok(()) } @@ -274,14 +254,8 @@ async fn read_listen_url_from_stdout(child: &mut Child) -> anyhow::Result String { - websocket_url - .strip_prefix("ws+http://") - .map_or_else(|| websocket_url.to_string(), |url| format!("ws://{url}")) -} diff --git a/codex-rs/exec-server/tests/health.rs b/codex-rs/exec-server/tests/health.rs deleted file mode 100644 index 6b366db44e..0000000000 --- a/codex-rs/exec-server/tests/health.rs +++ /dev/null @@ -1,30 +0,0 @@ -#![cfg(unix)] - -mod common; - -use codex_exec_server::ExecServerClient; -use codex_exec_server::RemoteExecServerConnectArgs; -use common::exec_server::http_exec_server; -use pretty_assertions::assert_eq; - -#[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn http_upgrade_exec_server_serves_readyz_and_accepts_clients() -> anyhow::Result<()> { - let mut server = http_exec_server().await?; - let http_base_url = server - .websocket_url() - .strip_prefix("ws+http://") - .expect("HTTP-upgrade websocket URL should use ws+http://"); - - let response = reqwest::get(format!("http://{http_base_url}/readyz")).await?; - assert_eq!(response.status(), reqwest::StatusCode::OK); - - let client = ExecServerClient::connect_websocket(RemoteExecServerConnectArgs::new( - server.websocket_url().to_string(), - "exec-server-health-test".to_string(), - )) - .await?; - drop(client); - - server.shutdown().await?; - Ok(()) -}