No public description

PiperOrigin-RevId: 1009602818

Author: Google Team Member

internal/cli/custom/envruntime/poller_test.go

@@ -31,7 +31,6 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
-	"syscall"
 	"testing"
 	"time"
 )
@@ -115,10 +114,15 @@ func TestSingleflightDoAndDoChan(t *testing.T) {
 }
 
 func TestShellCommandProvisionerAndStatelessPoller(t *testing.T) {
+	origPath := os.Getenv("PATH")
+	tempBin := t.TempDir()
+	for _, shName := range []string{"sh", "sh.exe"} {
+		_ = os.WriteFile(filepath.Join(tempBin, shName), []byte("#!/bin/sh\n"), 0o755)
+	}
+	t.Setenv("PATH", tempBin)
 	if bin, args := ResolveProvisionShell("windows", "echo ok"); !strings.Contains(bin, "sh") || len(args) != 2 || args[0] != "-c" {
 		t.Errorf("ResolveProvisionShell(windows with PATH sh) = (%q, %v), want sh -c", bin, args)
 	}
-	origPath := os.Getenv("PATH")
 	t.Setenv("PATH", "")
 	if bin, args := ResolveProvisionShell("windows", "echo ok"); bin != "cmd.exe" || len(args) != 2 || args[0] != "/C" {
 		t.Errorf("ResolveProvisionShell(windows without PATH sh) = (%q, %v), want cmd.exe /C", bin, args)
@@ -159,8 +163,8 @@ func TestShellCommandProvisionerAndStatelessPoller(t *testing.T) {
 		if idx := strings.LastIndexByte(string(statBytes), ')'); idx >= 0 {
 			fields := strings.Fields(string(statBytes[idx+1:]))
 			if len(fields) >= 3 {
-				if childPgid, err := strconv.Atoi(fields[2]); err == nil && childPgid == syscall.Getpgrp() {
-					t.Errorf("childPgid = %d, want != parent pgid %d (ConfigureSubprocessGroup must set new process group)", childPgid, syscall.Getpgrp())
+				if childPgid, err := strconv.Atoi(fields[2]); err == nil && childPgid == os.Getpid() {
+					t.Errorf("childPgid = %d, want != parent pid %d (ConfigureSubprocessGroup must set new process group)", childPgid, os.Getpid())
 				}
 			}
 		}

internal/cli/custom/envruntime/sandbox_test.go

@@ -39,6 +39,9 @@ func mustSymlink(t *testing.T, target, link string) {
 
 func TestResolveSandboxDirs(t *testing.T) {
 	base := t.TempDir()
+	if evalBase, err := filepath.EvalSymlinks(base); err == nil {
+		base = evalBase
+	}
 	rootDir := filepath.Join(base, "root")
 	workDir := filepath.Join(rootDir, "proj")
 	// create=false validates confinement without mutating disk (used before --dry-run).
@@ -712,6 +715,19 @@ func TestSandboxShellEnvBuffersAndSubprocessKill(t *testing.T) {
 	if bin, _ := ResolveShellCommand("linux", "ls"); bin != "sh" {
 		t.Errorf("ResolveShellCommand(linux, empty PATH) = %q, want sh", bin)
 	}
+	if bin, args := resolveShellCommand("windows", func(name string) (string, error) {
+		if name == "bash" {
+			return `C:\Windows\System32\bash.exe`, nil
+		}
+		return `C:\Program Files\Git\bin\sh.exe`, nil
+	}, "echo hi"); bin != `C:\Program Files\Git\bin\sh.exe` || len(args) != 2 || args[0] != "-c" {
+		t.Errorf("resolveShellCommand(windows WSL bash fallback to sh) = (%q, %v)", bin, args)
+	}
+	if bin, _ := resolveShellCommand("windows", func(name string) (string, error) {
+		return `C:\Program Files\Git\bin\bash.exe`, nil
+	}, "echo hi"); bin != `C:\Program Files\Git\bin\bash.exe` {
+		t.Errorf("resolveShellCommand(windows Git bash) = %q", bin)
+	}
 	t.Setenv("PATH", origPath)
 	if len(ShutdownSignals()) == 0 {
 		t.Error("ShutdownSignals() returned empty slice")

internal/cli/custom/envruntime/shell.go

@@ -161,10 +161,14 @@ func isWindowsWSLStubBash(goos, p string) bool {
 
 // ResolveShellCommand selects bash, sh, or cmd.exe to execute command on goos.
 func ResolveShellCommand(goos, command string) (string, []string) {
-	if p, err := exec.LookPath("bash"); err == nil && !isWindowsWSLStubBash(goos, p) {
+	return resolveShellCommand(goos, exec.LookPath, command)
+}
+
+func resolveShellCommand(goos string, lookPath func(string) (string, error), command string) (string, []string) {
+	if p, err := lookPath("bash"); err == nil && !isWindowsWSLStubBash(goos, p) {
 		return p, []string{"-c", command}
 	}
-	if p, err := exec.LookPath("sh"); err == nil {
+	if p, err := lookPath("sh"); err == nil {
 		return p, []string{"-c", command}
 	}
 	if goos == "windows" {