acc: KillProcess: wait for process to be killed

acceptance/internal/prepare_server.go

@@ -221,7 +221,6 @@ func startLocalServer(t *testing.T,
 
 			if shouldKillCaller(stub, killCounters, killCountersMu) {
 				killCaller(t, stub.Pattern, req.Headers)
-				return testserver.Response{StatusCode: http.StatusOK}
 			}
 
 			return stub.Response
@@ -266,6 +265,9 @@ func killCaller(t *testing.T, pattern string, headers http.Header) {
 		return
 	}
 
+	if !waitForProcessExit(pid, 2*time.Second) {
+		t.Logf("KillCaller: timed out waiting for PID %d to exit (pattern: %s)", pid, pattern)
+	}
 	t.Logf("KillCaller: killed PID %d (pattern: %s)", pid, pattern)
 }
 

acceptance/internal/process_unix.go

@@ -0,0 +1,19 @@
+//go:build linux || darwin
+
+package internal
+
+import (
+	"syscall"
+	"time"
+)
+
+func waitForProcessExit(pid int, timeout time.Duration) bool {
+	deadline := time.Now().Add(timeout)
+	for time.Now().Before(deadline) {
+		if syscall.Kill(pid, 0) != nil {
+			return true
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+	return false
+}

acceptance/internal/process_windows.go

@@ -0,0 +1,27 @@
+//go:build windows
+
+package internal
+
+import (
+	"time"
+
+	"golang.org/x/sys/windows"
+)
+
+func waitForProcessExit(pid int, timeout time.Duration) bool {
+	deadline := time.Now().Add(timeout)
+	for time.Now().Before(deadline) {
+		handle, err := windows.OpenProcess(windows.PROCESS_QUERY_LIMITED_INFORMATION, false, uint32(pid))
+		if err != nil {
+			return true
+		}
+		var exitCode uint32
+		err = windows.GetExitCodeProcess(handle, &exitCode)
+		windows.CloseHandle(handle)
+		if err != nil || exitCode != uint32(windows.STATUS_PENDING) {
+			return true
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+	return false
+}

go.mod

@@ -33,7 +33,7 @@ require (
 	golang.org/x/mod v0.31.0
 	golang.org/x/oauth2 v0.34.0
 	golang.org/x/sync v0.19.0
-	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/sys v0.39.0
 	golang.org/x/term v0.38.0
 	golang.org/x/text v0.32.0
 	gopkg.in/ini.v1 v1.67.0 // Apache 2.0