Set m.err before closing exitCh

Signed-off-by: Kazuyoshi Kato <[email protected]>

Author: Kazuyoshi Kato

machine.go

@@ -443,7 +443,10 @@ func (m *Machine) startVMM(ctx context.Context) error {
 
 	if err != nil {
 		m.logger.Errorf("Failed to start VMM: %s", err)
+
+		m.err = err
 		close(m.exitCh)
+
 		return err
 	}
 	m.logger.Debugf("VMM started socket path is %s", m.Cfg.SocketPath)
@@ -497,9 +500,10 @@ func (m *Machine) startVMM(ctx context.Context) error {
 	// Wait for firecracker to initialize:
 	err = m.waitForSocket(3*time.Second, errCh)
 	if err != nil {
-		msg := fmt.Sprintf("Firecracker did not create API socket %s: %s", m.Cfg.SocketPath, err)
-		err = errors.New(msg)
+		err = errors.Wrapf(err, "Firecracker did not create API socket %s", m.Cfg.SocketPath)
+		m.err = err
 		close(m.exitCh)
+
 		return err
 	}
 	go func() {

machine_test.go

@@ -1076,37 +1076,18 @@ func TestCaptureFifoToFile_leak(t *testing.T) {
 	assert.Contains(t, loggerBuffer.String(), expected)
 }
 
-func TestWait(t *testing.T) {
+func TestWaitWithKill(t *testing.T) {
 	fctesting.RequiresRoot(t)
 	ctx := context.Background()
 
 	socketPath := filepath.Join(testDataPath, t.Name())
 	defer os.Remove(socketPath)
 
-	cfg := Config{
-		SocketPath:      socketPath,
-		KernelImagePath: getVmlinuxPath(t),
-		MachineCfg: models.MachineConfiguration{
-			VcpuCount:   Int64(2),
-			CPUTemplate: models.CPUTemplate(models.CPUTemplateT2),
-			MemSizeMib:  Int64(256),
-			HtEnabled:   Bool(false),
-		},
-		Drives: []models.Drive{
-			{
-				DriveID:      String("root"),
-				IsRootDevice: Bool(true),
-				IsReadOnly:   Bool(true),
-				PathOnHost:   String(testRootfs),
-			},
-		},
-	}
-
+	cfg := createValidConfig(t, socketPath)
 	cmd := VMCommandBuilder{}.
 		WithSocketPath(cfg.SocketPath).
 		WithBin(getFirecrackerBinaryPath()).
 		Build(ctx)
-
 	m, err := NewMachine(ctx, cfg, WithProcessRunner(cmd))
 	require.NoError(t, err)
 
@@ -1127,3 +1108,82 @@ func TestWait(t *testing.T) {
 	err = m.Wait(ctx)
 	require.Error(t, err, "Firecracker was killed and it must be reported")
 }
+
+func TestWaitWithInvalidBinary(t *testing.T) {
+	ctx := context.Background()
+
+	socketPath := filepath.Join(testDataPath, t.Name())
+	defer os.Remove(socketPath)
+
+	cfg := createValidConfig(t, socketPath)
+	cmd := VMCommandBuilder{}.
+		WithSocketPath(socketPath).
+		WithBin("invalid-bin").
+		Build(ctx)
+	m, err := NewMachine(ctx, cfg, WithProcessRunner(cmd))
+	require.NoError(t, err)
+
+	ch := make(chan error)
+
+	go func() {
+		err := m.Wait(ctx)
+		require.Error(t, err, "Wait() reports an error")
+		ch <- err
+	}()
+
+	err = m.Start(ctx)
+	require.Error(t, err, "Start() reports an error")
+
+	select {
+	case errFromWait := <-ch:
+		require.Equal(t, errFromWait, err)
+	}
+}
+
+func TestWaitWithNoSocket(t *testing.T) {
+	ctx := context.Background()
+
+	socketPath := filepath.Join(testDataPath, t.Name())
+	defer os.Remove(socketPath)
+	cfg := createValidConfig(t, socketPath)
+
+	m, err := NewMachine(ctx, cfg, WithProcessRunner(exec.Command("sleep", "10")))
+	require.NoError(t, err)
+
+	ch := make(chan error)
+
+	go func() {
+		err := m.Wait(ctx)
+		require.Error(t, err, "Wait() reports an error")
+		ch <- err
+	}()
+
+	err = m.Start(ctx)
+	require.Error(t, err, "Start() reports an error")
+
+	select {
+	case errFromWait := <-ch:
+		require.Equal(t, errFromWait, err)
+	}
+}
+
+func createValidConfig(t *testing.T, socketPath string) Config {
+	return Config{
+		SocketPath:      socketPath,
+		KernelImagePath: getVmlinuxPath(t),
+		MachineCfg: models.MachineConfiguration{
+			VcpuCount:   Int64(2),
+			CPUTemplate: models.CPUTemplate(models.CPUTemplateT2),
+			MemSizeMib:  Int64(256),
+			HtEnabled:   Bool(false),
+		},
+		Drives: []models.Drive{
+			{
+				DriveID:      String("root"),
+				IsRootDevice: Bool(true),
+				IsReadOnly:   Bool(true),
+				PathOnHost:   String(testRootfs),
+			},
+		},
+	}
+}