Skip to content

Fix cargo home tests failing on Windows nightly #1814

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
Mikola Lysenko (mikolalysenko) merged 1 commit into from
Oct 29, 2026
Merged

Fix cargo home tests failing on Windows nightly #1814

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
20 changes: 12 additions & 8 deletions crates/socket-patch-core/tests/crawler_cargo_e2e.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ use socket_patch_core::formats::cargo::manifest::package_name_version;

const ORG_PURL: &str = "pkg:cargo/serde@1.0.200";

/// The variable cargo reads the user home from: `HOME` on Unix,
/// `USERPROFILE` on Windows (it ignores `HOME` there).
const HOME_VAR: &str = if cfg!(windows) { "USERPROFILE" } else { "HOME" };

fn options_at(root: &Path) -> CrawlerOptions {
CrawlerOptions {
cwd: root.to_path_buf(),
Expand Down Expand Up @@ -143,9 +147,9 @@ async fn cargo_home_fallback_to_home_dot_cargo() {
tokio::fs::create_dir_all(&stamp_dir).await.unwrap();

let prev_cargo = std::env::var("CARGO_HOME").ok();
let prev_home = std::env::var("HOME").ok();
let prev_home = std::env::var(HOME_VAR).ok();
std::env::remove_var("CARGO_HOME");
std::env::set_var("HOME", tmp.path());
std::env::set_var(HOME_VAR, tmp.path());

let crawler = CargoCrawler;
let opts = CrawlerOptions {
Expand All @@ -159,9 +163,9 @@ async fn cargo_home_fallback_to_home_dot_cargo() {
std::env::set_var("CARGO_HOME", v);
}
if let Some(v) = prev_home {
std::env::set_var("HOME", v);
std::env::set_var(HOME_VAR, v);
} else {
std::env::remove_var("HOME");
std::env::remove_var(HOME_VAR);
}

// Exactly the one staged index dir — proves the fallback resolved to
Expand Down Expand Up @@ -198,9 +202,9 @@ async fn empty_cargo_home_falls_back_to_home_dot_cargo() {
tokio::fs::create_dir_all(&stamp_dir).await.unwrap();

let prev_cargo = std::env::var("CARGO_HOME").ok();
let prev_home = std::env::var("HOME").ok();
let prev_home = std::env::var(HOME_VAR).ok();
std::env::set_var("CARGO_HOME", "");
std::env::set_var("HOME", tmp.path());
std::env::set_var(HOME_VAR, tmp.path());

let crawler = CargoCrawler;
let opts = CrawlerOptions {
Expand All @@ -215,8 +219,8 @@ async fn empty_cargo_home_falls_back_to_home_dot_cargo() {
None => std::env::remove_var("CARGO_HOME"),
}
match prev_home {
Some(v) => std::env::set_var("HOME", v),
None => std::env::remove_var("HOME"),
Some(v) => std::env::set_var(HOME_VAR, v),
None => std::env::remove_var(HOME_VAR),
}

assert_eq!(
Expand Down
Loading