openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-23 18:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'etraut/tui-cleanup-5' into etraut/tui-cleanup-6

Browse Source
This commit is contained in:
Eric Traut
2026-04-29 21:17:18 -07:00
parent 1f71256f29 8a37b7ad38
commit 468d889c17
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/tui/src/app/tests.rs
+22 -20
View File
@@ -4879,12 +4879,12 @@ async fn shutdown_first_exit_returns_immediate_exit_when_shutdown_submit_fails()
let thread_id = ThreadId::new();
app.active_thread_id = Some(thread_id);
let mut app_server = crate::start_embedded_app_server_for_picker(app.chat_widget.config_ref())
.await
.expect("embedded app server");
let control = app
.handle_exit_mode(&mut app_server, ExitMode::ShutdownFirst)
.await;
let mut app_server = Box::pin(crate::start_embedded_app_server_for_picker(
app.chat_widget.config_ref(),
))
.await
.expect("embedded app server");
let control = Box::pin(app.handle_exit_mode(&mut app_server, ExitMode::ShutdownFirst)).await;
assert_eq!(app.pending_shutdown_exit_thread_id, None);
assert!(matches!(
@@ -4895,16 +4895,16 @@ async fn shutdown_first_exit_returns_immediate_exit_when_shutdown_submit_fails()
#[tokio::test]
async fn shutdown_first_exit_uses_app_server_shutdown_without_submitting_op() {
let (mut app, _app_event_rx, mut op_rx) = make_test_app_with_channels().await;
let (mut app, _app_event_rx, mut op_rx) = Box::pin(make_test_app_with_channels()).await;
let thread_id = ThreadId::new();
app.active_thread_id = Some(thread_id);
let mut app_server = crate::start_embedded_app_server_for_picker(app.chat_widget.config_ref())
.await
.expect("embedded app server");
let control = app
.handle_exit_mode(&mut app_server, ExitMode::ShutdownFirst)
.await;
let mut app_server = Box::pin(crate::start_embedded_app_server_for_picker(
app.chat_widget.config_ref(),
))
.await
.expect("embedded app server");
let control = Box::pin(app.handle_exit_mode(&mut app_server, ExitMode::ShutdownFirst)).await;
assert_eq!(app.pending_shutdown_exit_thread_id, None);
assert!(matches!(
@@ -4920,9 +4920,11 @@ async fn shutdown_first_exit_uses_app_server_shutdown_without_submitting_op() {
#[tokio::test]
async fn interrupt_without_active_turn_is_treated_as_handled() {
let mut app = make_test_app().await;
let mut app_server = crate::start_embedded_app_server_for_picker(app.chat_widget.config_ref())
.await
.expect("embedded app server");
let mut app_server = Box::pin(crate::start_embedded_app_server_for_picker(
app.chat_widget.config_ref(),
))
.await
.expect("embedded app server");
let started = app_server
.start_thread(app.chat_widget.config_ref())
.await
@@ -4933,10 +4935,10 @@ async fn interrupt_without_active_turn_is_treated_as_handled() {
.expect("primary thread should be registered");
let op = AppCommand::interrupt();
let handled = app
.try_submit_active_thread_op_via_app_server(&mut app_server, thread_id, &op)
.await
.expect("interrupt submission should not fail");
let handled =
Box::pin(app.try_submit_active_thread_op_via_app_server(&mut app_server, thread_id, &op))
.await
.expect("interrupt submission should not fail");
assert_eq!(handled, true);
}
codex-rs/tui/src/status/tests.rs
+1
View File
@@ -81,6 +81,7 @@ async fn test_config(temp_home: &TempDir) -> Config {
.build()
.await
.expect("load config");
config.approvals_reviewer = ApprovalsReviewer::User;
config
.permissions
.set_permission_profile(app_server_workspace_write_profile(