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

Fix remaining Bazel test flakes

Browse Source
This commit is contained in:
Neil Patel
2026-04-07 10:16:37 -04:00
parent e30658b094
commit e8e2e96a0c
2 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
codex-rs/app-server/tests/suite/v2/client_metadata.rs
View File

@@ -1,6 +1,5 @@
use anyhow::Result;
use app_test_support::McpProcess;
use app_test_support::create_shell_command_sse_response;
use app_test_support::to_response;
use codex_app_server_protocol::JSONRPCResponse;
use codex_app_server_protocol::RequestId;
@@ -102,37 +101,22 @@ async fn turn_start_forwards_client_metadata_to_responses_request_v2() -> Result
async fn turn_steer_updates_client_metadata_on_follow_up_responses_request_v2() -> Result<()> {
skip_if_no_network!(Ok(()));
#[cfg(target_os = "windows")]
let shell_command = vec![
"powershell".to_string(),
"-Command".to_string(),
"Start-Sleep -Seconds 1".to_string(),
];
#[cfg(not(target_os = "windows"))]
let shell_command = vec!["sleep".to_string(), "1".to_string()];
let codex_home = TempDir::new()?;
let workdir = codex_home.path().join("workdir");
std::fs::create_dir(&workdir)?;
let server = responses::start_mock_server().await;
let request_log = responses::mount_sse_sequence(
&server,
vec![
create_shell_command_sse_response(
shell_command,
Some(&workdir),
Some(5_000),
"call_sleep",
)?,
responses::sse(vec![
responses::ev_response_created("resp-2"),
responses::ev_assistant_message("msg-2", "Done"),
responses::ev_completed("resp-2"),
]),
],
)
.await;
let first_response = responses::sse_response(responses::sse(vec![
responses::ev_response_created("resp-1"),
responses::ev_assistant_message("msg-1", "Working"),
responses::ev_completed("resp-1"),
]))
.set_delay(std::time::Duration::from_secs(2));
let second_response = responses::sse_response(responses::sse(vec![
responses::ev_response_created("resp-2"),
responses::ev_assistant_message("msg-2", "Done"),
responses::ev_completed("resp-2"),
]));
let request_log =
responses::mount_response_sequence(&server, vec![first_response, second_response]).await;
create_config_toml(
codex_home.path(),
@@ -163,7 +147,6 @@ async fn turn_steer_updates_client_metadata_on_follow_up_responses_request_v2()
text_elements: Vec::new(),
}],
responsesapi_client_metadata: Some(start_metadata.clone()),
cwd: Some(workdir.clone()),
..Default::default()
})
.await?;

13
codex-rs/core/tests/suite/sqlite_state.rs
View File

@@ -463,16 +463,17 @@ async fn tool_call_logs_include_thread_id() -> Result<()> {
let db = test.codex.state_db().expect("state db enabled");
let expected_thread_id = test.session_configured.session_id.to_string();
let subscriber = tracing_subscriber::registry().with(codex_state::log_db::start(db.clone()));
let dispatch = tracing::Dispatch::new(subscriber);
let _guard = tracing::dispatcher::set_default(&dispatch);
test.submit_turn("run a shell command").await?;
{
let log_db_layer = codex_state::log_db::start(db.clone());
let subscriber = tracing_subscriber::registry().with(log_db_layer.clone());
let dispatch = tracing::Dispatch::new(subscriber);
tracing::dispatcher::with_default(&dispatch, || {
let span = tracing::info_span!("test_log_span", thread_id = %expected_thread_id);
let _entered = span.enter();
tracing::info!("ToolCall: shell_command {{\"command\":\"echo hello\"}}");
}
});
log_db_layer.flush().await;
let mut found = None;
for _ in 0..80 {