mirror of https://github.com/astral-sh/uv
fix: edit tests to be windows-compatible
This commit is contained in:
F4RAN
parent
d4f84d6c89
commit
63a06880ff
|
|
@ -9,26 +9,45 @@ use crate::common::{TestContext, uv_snapshot};
|
|||
fn python_update_shell_not_in_path() {
|
||||
let context = TestContext::new("3.12");
|
||||
|
||||
// Zsh uses .zshenv, not .zshrc
|
||||
let shell_config = context.home_dir.child(".zshenv");
|
||||
#[cfg(not(windows))]
|
||||
{
|
||||
// Zsh uses .zshenv, not .zshrc
|
||||
let shell_config = context.home_dir.child(".zshenv");
|
||||
|
||||
uv_snapshot!(context.filters(), context
|
||||
.python_update_shell()
|
||||
.env(EnvVars::HOME, context.home_dir.as_os_str())
|
||||
.env("SHELL", "/bin/zsh"), @r###"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
uv_snapshot!(context.filters(), context
|
||||
.python_update_shell()
|
||||
.env(EnvVars::HOME, context.home_dir.as_os_str())
|
||||
.env("SHELL", "/bin/zsh"), @r###"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Created configuration file: [HOME]/.zshenv
|
||||
Restart your shell to apply changes
|
||||
"###);
|
||||
----- stderr -----
|
||||
Created configuration file: [HOME]/.zshenv
|
||||
Restart your shell to apply changes
|
||||
"###);
|
||||
|
||||
// Verify the file was created with the correct content
|
||||
let contents = fs_err::read_to_string(shell_config.path()).unwrap();
|
||||
assert!(contents.contains("export PATH="));
|
||||
assert!(contents.contains("# uv"));
|
||||
// Verify the file was created with the correct content
|
||||
let contents = fs_err::read_to_string(shell_config.path()).unwrap();
|
||||
assert!(contents.contains("export PATH="));
|
||||
assert!(contents.contains("# uv"));
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
{
|
||||
// On Windows, PATH is updated in the registry, not a config file
|
||||
uv_snapshot!(context.filters(), context
|
||||
.python_update_shell()
|
||||
.env(EnvVars::HOME, context.home_dir.as_os_str()), @r###"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Updated PATH to include executable directory [USER_CONFIG_DIR]/data/../bin
|
||||
Restart your shell to apply changes
|
||||
"###);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -39,72 +58,119 @@ fn python_update_shell_already_in_path() {
|
|||
let bin_dir = context.home_dir.child("bin");
|
||||
fs_err::create_dir_all(bin_dir.path()).unwrap();
|
||||
|
||||
// Set PATH to include the bin directory so it's "already in PATH"
|
||||
let path_with_bin = std::env::join_paths(std::iter::once(bin_dir.path().to_path_buf()).chain(
|
||||
std::env::split_paths(&std::env::var(EnvVars::PATH).unwrap_or_default()),
|
||||
))
|
||||
.unwrap();
|
||||
#[cfg(not(windows))]
|
||||
{
|
||||
// Set PATH to include the bin directory so it's "already in PATH"
|
||||
let path_with_bin =
|
||||
std::env::join_paths(std::iter::once(bin_dir.path().to_path_buf()).chain(
|
||||
std::env::split_paths(&std::env::var(EnvVars::PATH).unwrap_or_default()),
|
||||
))
|
||||
.unwrap();
|
||||
|
||||
// Run without --force - should skip because it's already in PATH
|
||||
uv_snapshot!(context.filters(), context
|
||||
.python_update_shell()
|
||||
.env(EnvVars::HOME, context.home_dir.as_os_str())
|
||||
.env(EnvVars::UV_PYTHON_BIN_DIR, bin_dir.path())
|
||||
.env(EnvVars::PATH, path_with_bin)
|
||||
.env("SHELL", "/bin/zsh"), @r###"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
// Run without --force - should skip because it's already in PATH
|
||||
uv_snapshot!(context.filters(), context
|
||||
.python_update_shell()
|
||||
.env(EnvVars::HOME, context.home_dir.as_os_str())
|
||||
.env(EnvVars::UV_PYTHON_BIN_DIR, bin_dir.path())
|
||||
.env(EnvVars::PATH, path_with_bin)
|
||||
.env("SHELL", "/bin/zsh"), @r###"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Executable directory [HOME]/bin is already in PATH
|
||||
"###);
|
||||
----- stderr -----
|
||||
Executable directory [HOME]/bin is already in PATH
|
||||
"###);
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
{
|
||||
// On Windows, contains_path checks the registry, not env vars
|
||||
// Since we can't easily set up the registry in tests, we'll test
|
||||
// that the command succeeds. The "already in PATH" check will
|
||||
// depend on the actual registry state, which we can't control.
|
||||
// This test verifies the command works even if the path is already there.
|
||||
context
|
||||
.python_update_shell()
|
||||
.env(EnvVars::HOME, context.home_dir.as_os_str())
|
||||
.env(EnvVars::UV_PYTHON_BIN_DIR, bin_dir.path())
|
||||
.assert()
|
||||
.success();
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn python_update_shell_force() {
|
||||
let context = TestContext::new("3.12");
|
||||
|
||||
// Zsh uses .zshenv, not .zshrc
|
||||
let shell_config = context.home_dir.child(".zshenv");
|
||||
#[cfg(not(windows))]
|
||||
{
|
||||
// Zsh uses .zshenv, not .zshrc
|
||||
let shell_config = context.home_dir.child(".zshenv");
|
||||
|
||||
// First run - add to PATH
|
||||
context
|
||||
.python_update_shell()
|
||||
.env(EnvVars::HOME, context.home_dir.as_os_str())
|
||||
.env("SHELL", "/bin/zsh")
|
||||
.assert()
|
||||
.success();
|
||||
// First run - add to PATH
|
||||
context
|
||||
.python_update_shell()
|
||||
.env(EnvVars::HOME, context.home_dir.as_os_str())
|
||||
.env("SHELL", "/bin/zsh")
|
||||
.assert()
|
||||
.success();
|
||||
|
||||
let first_contents = fs_err::read_to_string(shell_config.path()).unwrap();
|
||||
let first_count = first_contents.matches("export PATH=").count();
|
||||
let first_contents = fs_err::read_to_string(shell_config.path()).unwrap();
|
||||
let first_count = first_contents.matches("export PATH=").count();
|
||||
|
||||
// Second run with --force - should update
|
||||
uv_snapshot!(context.filters(), context
|
||||
.python_update_shell()
|
||||
.arg("--force")
|
||||
.env(EnvVars::HOME, context.home_dir.as_os_str())
|
||||
.env("SHELL", "/bin/zsh"), @r###"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
// Second run with --force - should update
|
||||
uv_snapshot!(context.filters(), context
|
||||
.python_update_shell()
|
||||
.arg("--force")
|
||||
.env(EnvVars::HOME, context.home_dir.as_os_str())
|
||||
.env("SHELL", "/bin/zsh"), @r###"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Force updated configuration file: [HOME]/.zshenv
|
||||
Restart your shell to apply changes
|
||||
"###);
|
||||
----- stderr -----
|
||||
Force updated configuration file: [HOME]/.zshenv
|
||||
Restart your shell to apply changes
|
||||
"###);
|
||||
|
||||
// Verify only one PATH export exists (old one removed, new one added)
|
||||
let second_contents = fs_err::read_to_string(shell_config.path()).unwrap();
|
||||
let second_count = second_contents.matches("export PATH=").count();
|
||||
assert_eq!(
|
||||
first_count, second_count,
|
||||
"Should have same number of PATH exports"
|
||||
);
|
||||
// Verify only one PATH export exists (old one removed, new one added)
|
||||
let second_contents = fs_err::read_to_string(shell_config.path()).unwrap();
|
||||
let second_count = second_contents.matches("export PATH=").count();
|
||||
assert_eq!(
|
||||
first_count, second_count,
|
||||
"Should have same number of PATH exports"
|
||||
);
|
||||
|
||||
// Verify the command is at the end
|
||||
assert!(
|
||||
second_contents.trim_end().ends_with("export PATH=")
|
||||
|| second_contents.trim_end().ends_with('"')
|
||||
);
|
||||
// Verify the command is at the end
|
||||
assert!(
|
||||
second_contents.trim_end().ends_with("export PATH=")
|
||||
|| second_contents.trim_end().ends_with('"')
|
||||
);
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
{
|
||||
// On Windows, --force updates the registry
|
||||
// First run - add to PATH
|
||||
context
|
||||
.python_update_shell()
|
||||
.env(EnvVars::HOME, context.home_dir.as_os_str())
|
||||
.assert()
|
||||
.success();
|
||||
|
||||
// Second run with --force - should update registry
|
||||
uv_snapshot!(context.filters(), context
|
||||
.python_update_shell()
|
||||
.arg("--force")
|
||||
.env(EnvVars::HOME, context.home_dir.as_os_str()), @r###"
|
||||
success: true
|
||||
exit_code: 0
|
||||
----- stdout -----
|
||||
|
||||
----- stderr -----
|
||||
Force updated PATH to prioritize executable directory [USER_CONFIG_DIR]/data/../bin
|
||||
Restart your shell to apply changes
|
||||
"###);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue