mirror of
https://github.com/openai/codex.git
synced 2026-05-18 18:22:39 +00:00
## Why PR #13783 moved the `codex.rs` unit tests into `codex_tests.rs`. This applies the same extraction pattern across the rest of `codex-rs/core` so the production modules stay focused on runtime code instead of large inline test blocks. Keeping the tests in sibling files also makes follow-up edits easier to review because product changes no longer have to share a file with hundreds or thousands of lines of test scaffolding. ## What changed - replaced each inline `mod tests { ... }` in `codex-rs/core/src/**` with a path-based module declaration - moved each extracted unit test module into a sibling `*_tests.rs` file, using `mod_tests.rs` for `mod.rs` modules - preserved the existing `cfg(...)` guards and module-local structure so the refactor remains structural rather than behavioral ## Testing - `cargo test -p codex-core --lib` (`1653 passed; 0 failed; 5 ignored`) - `just fix -p codex-core` - `cargo fmt --check` - `cargo shear`
169 lines
4.7 KiB
Rust
169 lines
4.7 KiB
Rust
use super::*;
|
|
use std::path::PathBuf;
|
|
use std::process::Command;
|
|
|
|
#[test]
|
|
#[cfg(target_os = "macos")]
|
|
fn detects_zsh() {
|
|
let zsh_shell = get_shell(ShellType::Zsh, None).unwrap();
|
|
|
|
let shell_path = zsh_shell.shell_path;
|
|
|
|
assert_eq!(shell_path, std::path::Path::new("/bin/zsh"));
|
|
}
|
|
|
|
#[test]
|
|
#[cfg(target_os = "macos")]
|
|
fn fish_fallback_to_zsh() {
|
|
let zsh_shell = default_user_shell_from_path(Some(PathBuf::from("/bin/fish")));
|
|
|
|
let shell_path = zsh_shell.shell_path;
|
|
|
|
assert_eq!(shell_path, std::path::Path::new("/bin/zsh"));
|
|
}
|
|
|
|
#[test]
|
|
fn detects_bash() {
|
|
let bash_shell = get_shell(ShellType::Bash, None).unwrap();
|
|
let shell_path = bash_shell.shell_path;
|
|
|
|
assert!(
|
|
shell_path.file_name().and_then(|name| name.to_str()) == Some("bash"),
|
|
"shell path: {shell_path:?}",
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn detects_sh() {
|
|
let sh_shell = get_shell(ShellType::Sh, None).unwrap();
|
|
let shell_path = sh_shell.shell_path;
|
|
assert!(
|
|
shell_path.file_name().and_then(|name| name.to_str()) == Some("sh"),
|
|
"shell path: {shell_path:?}",
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn can_run_on_shell_test() {
|
|
let cmd = "echo \"Works\"";
|
|
if cfg!(windows) {
|
|
assert!(shell_works(
|
|
get_shell(ShellType::PowerShell, None),
|
|
"Out-String 'Works'",
|
|
true,
|
|
));
|
|
assert!(shell_works(get_shell(ShellType::Cmd, None), cmd, true,));
|
|
assert!(shell_works(Some(ultimate_fallback_shell()), cmd, true));
|
|
} else {
|
|
assert!(shell_works(Some(ultimate_fallback_shell()), cmd, true));
|
|
assert!(shell_works(get_shell(ShellType::Zsh, None), cmd, false));
|
|
assert!(shell_works(get_shell(ShellType::Bash, None), cmd, true));
|
|
assert!(shell_works(get_shell(ShellType::Sh, None), cmd, true));
|
|
}
|
|
}
|
|
|
|
fn shell_works(shell: Option<Shell>, command: &str, required: bool) -> bool {
|
|
if let Some(shell) = shell {
|
|
let args = shell.derive_exec_args(command, false);
|
|
let output = Command::new(args[0].clone())
|
|
.args(&args[1..])
|
|
.output()
|
|
.unwrap();
|
|
assert!(output.status.success());
|
|
assert!(String::from_utf8_lossy(&output.stdout).contains("Works"));
|
|
true
|
|
} else {
|
|
!required
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn derive_exec_args() {
|
|
let test_bash_shell = Shell {
|
|
shell_type: ShellType::Bash,
|
|
shell_path: PathBuf::from("/bin/bash"),
|
|
shell_snapshot: empty_shell_snapshot_receiver(),
|
|
};
|
|
assert_eq!(
|
|
test_bash_shell.derive_exec_args("echo hello", false),
|
|
vec!["/bin/bash", "-c", "echo hello"]
|
|
);
|
|
assert_eq!(
|
|
test_bash_shell.derive_exec_args("echo hello", true),
|
|
vec!["/bin/bash", "-lc", "echo hello"]
|
|
);
|
|
|
|
let test_zsh_shell = Shell {
|
|
shell_type: ShellType::Zsh,
|
|
shell_path: PathBuf::from("/bin/zsh"),
|
|
shell_snapshot: empty_shell_snapshot_receiver(),
|
|
};
|
|
assert_eq!(
|
|
test_zsh_shell.derive_exec_args("echo hello", false),
|
|
vec!["/bin/zsh", "-c", "echo hello"]
|
|
);
|
|
assert_eq!(
|
|
test_zsh_shell.derive_exec_args("echo hello", true),
|
|
vec!["/bin/zsh", "-lc", "echo hello"]
|
|
);
|
|
|
|
let test_powershell_shell = Shell {
|
|
shell_type: ShellType::PowerShell,
|
|
shell_path: PathBuf::from("pwsh.exe"),
|
|
shell_snapshot: empty_shell_snapshot_receiver(),
|
|
};
|
|
assert_eq!(
|
|
test_powershell_shell.derive_exec_args("echo hello", false),
|
|
vec!["pwsh.exe", "-NoProfile", "-Command", "echo hello"]
|
|
);
|
|
assert_eq!(
|
|
test_powershell_shell.derive_exec_args("echo hello", true),
|
|
vec!["pwsh.exe", "-Command", "echo hello"]
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_current_shell_detects_zsh() {
|
|
let shell = Command::new("sh")
|
|
.arg("-c")
|
|
.arg("echo $SHELL")
|
|
.output()
|
|
.unwrap();
|
|
|
|
let shell_path = String::from_utf8_lossy(&shell.stdout).trim().to_string();
|
|
if shell_path.ends_with("/zsh") {
|
|
assert_eq!(
|
|
default_user_shell(),
|
|
Shell {
|
|
shell_type: ShellType::Zsh,
|
|
shell_path: PathBuf::from(shell_path),
|
|
shell_snapshot: empty_shell_snapshot_receiver(),
|
|
}
|
|
);
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn detects_powershell_as_default() {
|
|
if !cfg!(windows) {
|
|
return;
|
|
}
|
|
|
|
let powershell_shell = default_user_shell();
|
|
let shell_path = powershell_shell.shell_path;
|
|
|
|
assert!(shell_path.ends_with("pwsh.exe") || shell_path.ends_with("powershell.exe"));
|
|
}
|
|
|
|
#[test]
|
|
fn finds_powershell() {
|
|
if !cfg!(windows) {
|
|
return;
|
|
}
|
|
|
|
let powershell_shell = get_shell(ShellType::PowerShell, None).unwrap();
|
|
let shell_path = powershell_shell.shell_path;
|
|
|
|
assert!(shell_path.ends_with("pwsh.exe") || shell_path.ends_with("powershell.exe"));
|
|
}
|