Skip to content

Fix Go GOWORK test failing on macOS nightly #1894

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

Open
Mikola Lysenko (mikolalysenko) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Go GOWORK test failing on macOS nightly #1894

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
15 changes: 12 additions & 3 deletions crates/socket-patch-cli/tests/e2e_golang_workspace_build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,8 +1405,17 @@ fn apply_never_writes_go_work_when_gowork_names_a_sibling_file() {
}
let tmp = tempfile::tempdir().unwrap();
let _guard = ChmodGuard(tmp.path().to_path_buf());
let w = stage_members(tmp.path(), UVER, UVER);
let m = Machine::new(tmp.path(), "sibling");
// go takes its working directory with symlinks resolved, so a GOWORK
// under an unresolved temp path (macOS's /var -> /private/var) holds
// no member go runs in. (Windows keeps the path: canonicalize would
// give a \\?\ path go can't use.)
let base = if cfg!(windows) {
tmp.path().to_path_buf()
} else {
tmp.path().canonicalize().unwrap()
};
let w = stage_members(&base, UVER, UVER);
let m = Machine::new(&base, "sibling");
download(&w.root, &m, &w.proxy);
write_local_patch(&w.root, VENDOR_UUID);
let ci = w.root.join("ci.work");
Expand Down Expand Up @@ -1477,7 +1486,7 @@ fn apply_never_writes_go_work_when_gowork_names_a_sibling_file() {
assert_eq!(read(&w.root.join("go.work")), work, "go.work untouched");
assert_eq!(read(&ci), work, "ci.work untouched");
for dir in ["a", "b"] {
let (stdout, stderr) = run_member(tmp.path(), &w.root, dir, &w.proxy, &gowork);
let (stdout, stderr) = run_member(&base, &w.root, dir, &w.proxy, &gowork);
assert!(
stdout.contains(&format!("{}: PATCHED", dir.to_uppercase())),
"{dir}: {stdout}\n{stderr}"
Expand Down
Loading