clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 06:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

codex: fix CI failure on PR #17108

Browse Source
This commit is contained in:
rupert-openai
2026-04-08 13:54:57 +01:00
parent 478afb40dd
commit 3c924b3e3e
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
codex-rs/app-server/src/transport/remote_control/websocket.rs
View File

@@ -920,6 +920,8 @@ mod tests {
use tokio::time::timeout;
use tokio_tungstenite::accept_async;
const TEST_HTTP_REQUEST_ACCEPT_TIMEOUT: Duration = Duration::from_secs(15);
async fn remote_control_state_runtime(codex_home: &TempDir) -> Arc<StateRuntime> {
StateRuntime::init(codex_home.path().to_path_buf(), "test-provider".to_string())
.await
@@ -1395,7 +1397,7 @@ mod tests {
}
async fn accept_http_request(listener: &TcpListener) -> (TcpStream, String) {
let (stream, _) = timeout(Duration::from_secs(5), listener.accept())
let (stream, _) = timeout(TEST_HTTP_REQUEST_ACCEPT_TIMEOUT, listener.accept())
.await
.expect("HTTP request should arrive in time")
.expect("listener accept should succeed");

9
codex-rs/protocol/src/protocol.rs
View File

@@ -3409,20 +3409,15 @@ pub enum TurnAbortReason {
ReviewEnded,
}
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, JsonSchema, TS)]
#[derive(Debug, Clone, Default, Deserialize, Serialize, PartialEq, JsonSchema, TS)]
#[serde(rename_all = "snake_case")]
#[ts(rename_all = "snake_case")]
pub enum CollabAgentSpawnTool {
#[default]
SpawnAgent,
SpawnAgentsOnCsv,
}
impl Default for CollabAgentSpawnTool {
fn default() -> Self {
Self::SpawnAgent
}
}
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, JsonSchema, TS)]
pub struct CollabAgentSpawnBeginEvent {
/// Identifier for the collab tool call.