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

clean up boilerplate

Browse Source
This commit is contained in:
Owen Lin
2025-11-02 13:36:20 -08:00
parent fbb04a608d
commit 644f53a4a4
4 changed files with 13 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
codex-rs/app-server/tests/suite/v2/thread_archive.rs
View File

@@ -8,7 +8,7 @@ use codex_app_server_protocol::ThreadArchiveResponse;
use codex_app_server_protocol::ThreadStartParams;
use codex_app_server_protocol::ThreadStartResponse;
use codex_core::ARCHIVED_SESSIONS_SUBDIR;
use codex_core::SESSIONS_SUBDIR;
use codex_core::find_conversation_path_by_id_str;
use std::path::Path;
use tempfile::TempDir;
use tokio::time::timeout;
@@ -27,16 +27,7 @@ async fn thread_archive_moves_rollout_into_archived_directory() -> Result<()> {
let start_id = mcp
.send_thread_start_request(ThreadStartParams {
model: Some("mock-model".to_string()),
model_provider: None,
profile: None,
cwd: None,
approval_policy: None,
sandbox: None,
config: None,
base_instructions: None,
developer_instructions: None,
compact_prompt: None,
include_apply_patch_tool: None,
..Default::default()
})
.await?;
let start_resp: JSONRPCResponse = timeout(
@@ -47,11 +38,10 @@ async fn thread_archive_moves_rollout_into_archived_directory() -> Result<()> {
let ThreadStartResponse { thread } = to_response::<ThreadStartResponse>(start_resp)?;
assert!(!thread.id.is_empty());
// Construct the rollout path derived from the id we got back.
let rollout_path = codex_home
.path()
.join(SESSIONS_SUBDIR)
.join(format!("{}.jsonl", thread.id));
// Locate the rollout path recorded for this thread id.
let rollout_path = find_conversation_path_by_id_str(codex_home.path(), &thread.id)
.await?
.expect("expected rollout path for thread id to exist");
assert!(
rollout_path.exists(),
"expected {} to exist",
@@ -73,7 +63,9 @@ async fn thread_archive_moves_rollout_into_archived_directory() -> Result<()> {
// Verify file moved.
let archived_directory = codex_home.path().join(ARCHIVED_SESSIONS_SUBDIR);
let archived_rollout_path = archived_directory.join(format!("{}.jsonl", thread.id));
// The archived file keeps the original filename (rollout-...-<id>.jsonl).
let archived_rollout_path =
archived_directory.join(rollout_path.file_name().expect("rollout file name"));
assert!(
!rollout_path.exists(),
"expected rollout path {} to be moved",