Merge pull request #5285 from sharifelgamal/windows-process

Kill all child processes when cleaning up integration tests

test/integration/fn_addons.go

@@ -82,7 +82,7 @@ func testDashboard(t *testing.T) {
 	mk := NewMinikubeRunner(t, p, "--wait=false")
 	cmd, out := mk.RunDaemon("dashboard --url")
 	defer func() {
-		err := cmd.Process.Kill()
+		err := util.KillProcess(cmd.Process.Pid, t)
 		if err != nil {
 			t.Logf("Failed to kill dashboard command: %v", err)
 		}

test/integration/fn_cluster_status.go

@@ -56,6 +56,6 @@ func testClusterStatus(t *testing.T) {
 	}
 
 	if err := retry.Expo(healthy, 500*time.Millisecond, time.Minute); err != nil {
-		t.Fatalf("Cluster is not healthy: %v", err)
+		t.Errorf("Cluster is not healthy: %v", err)
 	}
 }

test/integration/fn_mount.go

@@ -56,7 +56,7 @@ func testMounting(t *testing.T) {
 	mountCmd := getMountCmd(mk, tempDir)
 	cmd, _, _ := mk.RunDaemon2(mountCmd)
 	defer func() {
-		err := cmd.Process.Kill()
+		err = util.KillProcess(cmd.Process.Pid, t)
 		if err != nil {
 			t.Logf("Failed to kill mount command: %v", err)
 		}

test/integration/fn_tunnel.go

@@ -51,8 +51,8 @@ func testTunnel(t *testing.T) {
 	go func() {
 		output, stderr := mk.MustRun("tunnel --alsologtostderr -v 8 --logtostderr")
 		if t.Failed() {
-			t.Errorf("tunnel stderr : %s", stderr)
-			t.Errorf("tunnel output : %s", output)
+			t.Logf("tunnel stderr : %s", stderr)
+			t.Logf("tunnel output : %s", output)
 		}
 	}()
 

test/integration/util/common.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	"github.com/shirou/gopsutil/process"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/minikube/pkg/kapi"
 )
@@ -44,3 +45,30 @@ func Logf(str string, args ...interface{}) {
 	fmt.Printf(" %s | ", time.Now().Format("15:04:05"))
 	fmt.Println(fmt.Sprintf(str, args...))
 }
+
+// KillProcess kills the process associated with the given pid and all its children
+func KillProcess(pid int, t *testing.T) error {
+	p, err := process.NewProcess(int32(pid))
+	if err != nil {
+		// Process doesn't exist
+		return err
+	}
+	children, err := p.Children()
+	if err != nil {
+		// No children, log the error, don't exit
+		t.Log(err)
+	}
+	for _, c := range children {
+		err = c.Kill()
+		if err != nil {
+			// Log the error, but don't exit
+			t.Log(err)
+		}
+	}
+	err = p.Kill()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

test/integration/util/minikube_runner.go

@@ -224,7 +224,7 @@ func (m *MinikubeRunner) start(opts ...string) (stdout string, stderr string, er
 	return m.RunWithContext(ctx, cmd, true)
 }
 
-// StartWithFail starts the cluster and fail the test if error
+// MustStart starts the cluster and fail the test if error
 func (m *MinikubeRunner) MustStart(opts ...string) (stdout string, stderr string) {
 	stdout, stderr, err := m.start(opts...)
 	// the reason for this formatting is, the logs are very big but useful and also in parallel testing logs are harder to identify

test/integration/z_proxy_test.go

@@ -131,7 +131,7 @@ func testProxyDashboard(t *testing.T) {
 	mk := NewMinikubeRunner(t, p)
 	cmd, out := mk.RunDaemon("dashboard --url")
 	defer func() {
-		err := cmd.Process.Kill()
+		err := util.KillProcess(cmd.Process.Pid, t)
 		if err != nil {
 			t.Logf("Failed to kill dashboard command: %v", err)
 		}