Merge remote-tracking branch 'origin/pr/38'

Author: samuelkarp

HACKING.md

@@ -11,10 +11,10 @@ will run tests in verbose mode.
 You need some external resources in order to run the tests, as described below:
 
 1. A firecracker binary (tested with 0.10.1), but any recent version should
-   work.  Must either be installed as `./firecracker` or the path must be
-   specified through the `FC_TEST_BIN` environment variable.
-2. Access to hardware virtualization via `/dev/kvm` and `/dev/vhost-vsock` (ensure you have mode
-   `+rw`!)
+   work.  Must either be installed as `./testdata/firecracker` or the path must
+   be specified through the `FC_TEST_BIN` environment variable.
+2. Access to hardware virtualization via `/dev/kvm` and `/dev/vhost-vsock`
+   (ensure you have mode `+rw`!)
 3. An uncompressed Linux kernel binary that can boot in Firecracker VM (Must be
    installed as `./testdata/vmlinux`)
 4. A tap device owned by your userid (Must be either named `fc-test-tap0` or

machine.go

@@ -378,7 +378,7 @@ func (m *Machine) StopVMM() error {
 }
 
 func (m *Machine) stopVMM() error {
-	if m.cmd != nil {
+	if m.cmd != nil && m.cmd.Process != nil {
 		log.Debug("stopVMM(): sending sigterm to firecracker")
 		return m.cmd.Process.Signal(syscall.SIGTERM)
 	}

machine_test.go

@@ -118,13 +118,15 @@ func TestMicroVMExecution(t *testing.T) {
 
 	vmmCtx, vmmCancel := context.WithTimeout(ctx, 30*time.Second)
 	defer vmmCancel()
-	var exitchannel <-chan error
+	exitchannel := make(chan error)
 	go func() {
-		var err error
-		exitchannel, err = m.startVMM(vmmCtx)
+		exitCh, err := m.startVMM(vmmCtx)
 		if err != nil {
+			close(exitchannel)
 			t.Fatalf("Failed to start VMM: %v", err)
 		}
+		exitchannel <- <-exitCh
+		close(exitchannel)
 	}()
 	time.Sleep(2 * time.Second)
 
@@ -139,7 +141,12 @@ func TestMicroVMExecution(t *testing.T) {
 	t.Run("TestStartInstance", func(t *testing.T) { testStartInstance(vmmCtx, t, m) })
 
 	// Let the VMM start and stabilize...
-	time.Sleep(5 * time.Second)
+	timer := time.NewTimer(5 * time.Second)
+	select {
+	case <-timer.C:
+	case <-exitchannel:
+		// if we've already exited, there's no use waiting for the timer
+	}
 	t.Run("TestStopVMM", func(t *testing.T) { testStopVMM(ctx, t, m) })
 	<-exitchannel
 }