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

Merge branch 'rhan/emittance' into rhan/escalations-approvals-sandbox

Browse Source
This commit is contained in:
rhan-oai
2026-03-16 15:07:45 -07:00
committed by GitHub
parent 80a4f69bce fdbc0c20bf
commit 2c9a42ca48
3 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
codex-rs/core/tests/suite/items.rs
View File

@@ -356,6 +356,7 @@ async fn user_message_type_prompt_steering_metadata_is_emitted_when_feature_enab
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
<<<<<<< rhan/escalations-approvals-sandbox
async fn user_message_type_prompt_queued_metadata_is_emitted_when_feature_enabled()
-> anyhow::Result<()> {
skip_if_no_network!(Ok(()));
@@ -495,6 +496,8 @@ async fn user_message_type_prompt_queued_metadata_is_emitted_when_feature_enable
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
=======
>>>>>>> rhan/emittance
async fn assistant_message_item_is_emitted() -> anyhow::Result<()> {
skip_if_no_network!(Ok(()));