Merge pull request #35 from xibz/issue_33

xibz · web-flow · commit 8b22e081e711 · 2018-12-06T14:08:27.000-08:00
ensure tests have stopped VM upon completion
diff --git a/cmd/firectl/main_test.go b/cmd/firectl/main_test.go
@@ -147,6 +147,8 @@ func TestLogFiles(t *testing.T) {
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
+	defer m.StopVMM()
+
 	_, err = m.Init(ctx)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
diff --git a/machine_test.go b/machine_test.go
@@ -156,6 +156,7 @@ func TestStartVMM(t *testing.T) {
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
+	defer m.StopVMM()
 
 	timeout, cancel := context.WithTimeout(ctx, 250*time.Millisecond)
 	defer cancel()

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,8 @@ func TestLogFiles(t *testing.T) {`
`147`	`147`	`if err != nil {`
`148`	`148`	`t.Fatalf("unexpected error: %v", err)`
`149`	`149`	`}`
	`150`	`+ defer m.StopVMM()`
	`151`	`+`
`150`	`152`	`_, err = m.Init(ctx)`
`151`	`153`	`if err != nil {`
`152`	`154`	`t.Fatalf("unexpected error: %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ func TestStartVMM(t *testing.T) {`
`156`	`156`	`if err != nil {`
`157`	`157`	`t.Fatalf("unexpected error: %v", err)`
`158`	`158`	`}`
	`159`	`+ defer m.StopVMM()`
`159`	`160`
`160`	`161`	`timeout, cancel := context.WithTimeout(ctx, 250*time.Millisecond)`
`161`	`162`	`defer cancel()`