Skip to content

Commit 32106ac

Browse files
committed
Trim CI scope
1 parent 1e460ab commit 32106ac

File tree

4 files changed

+10
-20
lines changed

4 files changed

+10
-20
lines changed

codex-rs/app-server/tests/suite/v2/mcp_tool.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ use tokio::net::TcpListener;
3939
use tokio::task::JoinHandle;
4040
use tokio::time::timeout;
4141

42-
const DEFAULT_READ_TIMEOUT: Duration = if cfg!(windows) {
43-
Duration::from_secs(30)
44-
} else {
45-
Duration::from_secs(10)
46-
};
42+
const DEFAULT_READ_TIMEOUT: Duration = Duration::from_secs(10);
4743
const TEST_SERVER_NAME: &str = "tool_server";
4844
const TEST_TOOL_NAME: &str = "echo_tool";
4945

codex-rs/app-server/tests/suite/v2/thread_fork.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ use super::analytics::enable_analytics_capture;
4343
use super::analytics::thread_initialized_event;
4444
use super::analytics::wait_for_analytics_payload;
4545

46-
const DEFAULT_READ_TIMEOUT: std::time::Duration = if cfg!(windows) {
47-
std::time::Duration::from_secs(30)
48-
} else {
49-
std::time::Duration::from_secs(10)
50-
};
46+
const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10);
5147

5248
#[tokio::test]
5349
async fn thread_fork_creates_new_thread_and_emits_started() -> Result<()> {

codex-rs/core/src/plugins/discoverable_tests.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,17 +188,14 @@ async fn list_tool_suggest_discoverable_plugins_does_not_reload_marketplace_per_
188188
assert_eq!(discoverable_plugins[0].id, "slack@openai-curated");
189189

190190
let logs = String::from_utf8(buffer.lock().expect("buffer lock").clone()).expect("utf8 logs");
191-
let normalized_logs = logs.replace('\\', "/");
192191
assert_eq!(logs.matches("ignoring interface.defaultPrompt").count(), 2);
193192
assert_eq!(
194-
normalized_logs
195-
.matches("build-ios-apps/.codex-plugin/plugin.json")
193+
logs.matches("build-ios-apps/.codex-plugin/plugin.json")
196194
.count(),
197195
1
198196
);
199197
assert_eq!(
200-
normalized_logs
201-
.matches("life-science-research/.codex-plugin/plugin.json")
198+
logs.matches("life-science-research/.codex-plugin/plugin.json")
202199
.count(),
203200
1
204201
);

codex-rs/core/tests/suite/responses_api_proxy_headers.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use tempfile::TempDir;
2929
const PARENT_PROMPT: &str = "spawn a subagent and report when it is started";
3030
const CHILD_PROMPT: &str = "child: say done";
3131
const SPAWN_CALL_ID: &str = "spawn-call-1";
32-
const PROXY_START_TIMEOUT: Duration = Duration::from_secs(/*secs*/ 15);
32+
const PROXY_START_TIMEOUT: Duration = Duration::from_secs(/*secs*/ 5);
3333
const PROXY_POLL_INTERVAL: Duration = Duration::from_millis(/*millis*/ 20);
3434

3535
struct ResponsesApiProxy {
@@ -58,10 +58,11 @@ impl ResponsesApiProxy {
5858

5959
let deadline = Instant::now() + PROXY_START_TIMEOUT;
6060
loop {
61-
if let Ok(info) = std::fs::read_to_string(&server_info)
62-
&& let Ok(value) = serde_json::from_str::<Value>(&info)
63-
&& let Some(port) = value.get("port").and_then(Value::as_u64)
64-
{
61+
if let Ok(info) = std::fs::read_to_string(&server_info) {
62+
let port = serde_json::from_str::<Value>(&info)?
63+
.get("port")
64+
.and_then(Value::as_u64)
65+
.ok_or_else(|| anyhow!("proxy server info missing port"))?;
6566
return Ok(Self {
6667
child,
6768
port: u16::try_from(port)?,

0 commit comments

Comments
 (0)