Skip to content

fix: windows flake #18127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jif-oai merged 1 commit into from
Apr 16, 2026
Merged

fix: windows flake #18127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 16 additions & 21 deletions codex-rs/state/src/log_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,9 +384,8 @@ mod tests {
use std::io;
use std::sync::Arc;
use std::sync::Mutex;
use std::time::Duration;

use tokio::time::Instant;
use pretty_assertions::assert_eq;
use tracing_subscriber::filter::Targets;
use tracing_subscriber::fmt::writer::MakeWriter;
use tracing_subscriber::layer::SubscriberExt;
Expand Down Expand Up @@ -442,6 +441,7 @@ mod tests {
.await
.expect("initialize runtime");
let writer = SharedWriter::default();
let layer = start(runtime.clone());

let subscriber = tracing_subscriber::registry()
.with(
Expand All @@ -452,7 +452,8 @@ mod tests {
.with_filter(Targets::new().with_default(tracing::Level::TRACE)),
)
.with(
start(runtime.clone())
layer
.clone()
.with_filter(Targets::new().with_default(tracing::Level::TRACE)),
);
let guard = subscriber.set_default();
Expand All @@ -463,6 +464,7 @@ mod tests {
});
tracing::debug!("threadless-after");

layer.flush().await;
drop(guard);

let feedback_logs = writer.snapshot();
Expand All @@ -475,24 +477,17 @@ mod tests {
.collect::<Vec<_>>()
.join("\n")
};
let deadline = Instant::now() + Duration::from_secs(2);
loop {
let sqlite_logs = String::from_utf8(
runtime
.query_feedback_logs("thread-1")
.await
.expect("query feedback logs"),
)
.expect("valid utf-8");
if without_timestamps(&sqlite_logs) == without_timestamps(&feedback_logs) {
break;
}
assert!(
Instant::now() < deadline,
"sqlite feedback logs did not match feedback formatter output before timeout\nsqlite:\n{sqlite_logs}\nfeedback:\n{feedback_logs}"
);
tokio::time::sleep(Duration::from_millis(10)).await;
}
let sqlite_logs = String::from_utf8(
runtime
.query_feedback_logs("thread-1")
.await
.expect("query feedback logs"),
)
.expect("valid utf-8");
assert_eq!(
without_timestamps(&sqlite_logs),
without_timestamps(&feedback_logs)
);

let _ = tokio::fs::remove_dir_all(codex_home).await;
}
Expand Down
Loading