Skip to content

Serialize directory helper tests that open descriptors #57

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
SaladDay merged 1 commit into from
Sep 23, 2026
Merged

Serialize directory helper tests that open descriptors #57

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions packages/codex-executor/src/bin/directory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,14 @@ mod tests {
use crate::workspace_path::{anchor, directory};
use std::{fs, io, os::unix::fs::symlink};

// These tests open descriptors, so they share the lock that keeps the
// descriptor-count assertions in the directory tests deterministic.
fn serialized() -> std::sync::MutexGuard<'static, ()> {
crate::directory::TEST_LOCK
.lock()
.unwrap_or_else(|poisoned| poisoned.into_inner())
}

fn code(result: io::Result<serde_json::Value>) -> String {
match result {
Ok(value) => value["error"].as_str().unwrap_or("listed").to_string(),
Expand All @@ -153,6 +161,7 @@ mod tests {

#[test]
fn only_the_requested_path_resolution_is_not_a_directory() {
let _guard = serialized();
let workspace = tempfile::tempdir().unwrap();
let outside = tempfile::tempdir().unwrap();
let root = workspace.path().join("workspace");
Expand Down Expand Up @@ -204,6 +213,7 @@ mod tests {

#[test]
fn a_root_removed_after_opening_is_a_missing_workspace() {
let _guard = serialized();
let workspace = tempfile::tempdir().unwrap();
let root = workspace.path().join("workspace");
fs::create_dir_all(root.join("d")).unwrap();
Expand All @@ -224,6 +234,7 @@ mod tests {

#[test]
fn a_root_replaced_after_opening_is_a_missing_workspace() {
let _guard = serialized();
let workspace = tempfile::tempdir().unwrap();
let root = workspace.path().join("workspace");
let moved = workspace.path().join("moved");
Expand Down
Loading