Merge pull request moby#3804 from amurzeau/contrib3-dont-hang-on-process-early-exit

test: don't hang if a process doesn't run

Author: tonistiigi

util/testutil/integration/containerd.go

@@ -185,7 +185,7 @@ disabled_plugins = ["cri"]
 	if err != nil {
 		return nil, nil, err
 	}
-	if err := waitUnix(address, 10*time.Second); err != nil {
+	if err := waitUnix(address, 10*time.Second, cmd); err != nil {
 		ctdStop()
 		return nil, nil, errors.Wrapf(err, "containerd did not start up: %s", formatLogs(cfg.Logs))
 	}

util/testutil/integration/dockerd.go

@@ -145,7 +145,7 @@ func (c moby) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl func()
 	}
 	deferF.append(d.StopWithError)
 
-	if err := waitUnix(d.Sock(), 5*time.Second); err != nil {
+	if err := waitUnix(d.Sock(), 5*time.Second, nil); err != nil {
 		return nil, nil, errors.Errorf("dockerd did not start up: %q, %s", err, formatLogs(cfg.Logs))
 	}
 

util/testutil/integration/run.go

@@ -448,7 +448,7 @@ func runStargzSnapshotter(cfg *BackendConfig) (address string, cl func() error,
 	if err != nil {
 		return "", nil, err
 	}
-	if err = waitUnix(address, 10*time.Second); err != nil {
+	if err = waitUnix(address, 10*time.Second, cmd); err != nil {
 		snStop()
 		return "", nil, errors.Wrapf(err, "containerd-stargz-grpc did not start up: %s", formatLogs(cfg.Logs))
 	}

util/testutil/integration/sandbox.go

@@ -229,7 +229,7 @@ func runBuildkitd(ctx context.Context, conf *BackendConfig, args []string, logs
 	}
 	deferF.append(stop)
 
-	if err := waitUnix(address, 15*time.Second); err != nil {
+	if err := waitUnix(address, 15*time.Second, cmd); err != nil {
 		return "", nil, err
 	}
 

util/testutil/integration/util.go

@@ -44,8 +44,8 @@ func startCmd(cmd *exec.Cmd, logs map[string]*bytes.Buffer) (func() error, error
 	stopped := make(chan struct{})
 	stop := make(chan struct{})
 	eg.Go(func() error {
-		st, err := cmd.Process.Wait()
-		fmt.Fprintf(cmd.Stderr, "> stopped %v %+v %v\n", time.Now(), st, st.ExitCode())
+		err := cmd.Wait()
+		fmt.Fprintf(cmd.Stderr, "> stopped %v %+v %v\n", time.Now(), cmd.ProcessState, cmd.ProcessState.ExitCode())
 		close(stopped)
 		select {
 		case <-stop:
@@ -88,7 +88,7 @@ func setCmdLogs(cmd *exec.Cmd, logs map[string]*bytes.Buffer) {
 	cmd.Stderr = &lockingWriter{Writer: b}
 }
 
-func waitUnix(address string, d time.Duration) error {
+func waitUnix(address string, d time.Duration, cmd *exec.Cmd) error {
 	address = strings.TrimPrefix(address, "unix://")
 	addr, err := net.ResolveUnixAddr("unix", address)
 	if err != nil {
@@ -98,6 +98,10 @@ func waitUnix(address string, d time.Duration) error {
 	step := 50 * time.Millisecond
 	i := 0
 	for {
+		if cmd != nil && cmd.ProcessState != nil {
+			return errors.Errorf("process exited: %s", cmd.String())
+		}
+
 		if conn, err := net.DialUnix("unix", nil, addr); err == nil {
 			conn.Close()
 			break