Merge pull request firecracker-microvm#487 from kzys/enable-pause-resume-tests

kzys · web-flow · commit 5285a2ab95d9 · 2021-04-16T16:51:28.000-07:00
Enable tests regarding Pause/Resume
diff --git a/runtime/service_integ_test.go b/runtime/service_integ_test.go
@@ -2040,7 +2040,7 @@ func TestCreateVM_Isolated(t *testing.T) {
 	}
 }
 
-func TestPauseResume(t *testing.T) {
+func TestPauseResume_Isolated(t *testing.T) {
 	prepareIntegTest(t)
 
 	client, err := containerd.New(containerdSockPath, containerd.WithDefaultRuntime(firecrackerRuntime))
@@ -2152,6 +2152,10 @@ func TestPauseResume(t *testing.T) {
 		// Ensure the response fields are populated correctly
 		assert.Equal(t, request.VMID, resp.VMID)
 
+		// Currently StopVM doesn't work when the VM is paused, since StopVM calls its in-VM agent.
+		_, err = fcClient.ResumeVM(ctx, &proto.ResumeVMRequest{VMID: request.VMID})
+		require.Equal(t, status.Code(err), codes.OK)
+
 		_, err = fcClient.StopVM(ctx, &proto.StopVMRequest{VMID: request.VMID})
 		require.Equal(t, status.Code(err), codes.OK)
 	}

Original file line number	Diff line number	Diff line change
`@@ -2040,7 +2040,7 @@ func TestCreateVM_Isolated(t *testing.T) {`
`2040`	`2040`	`}`
`2041`	`2041`	`}`
`2042`	`2042`
`2043`		`-func TestPauseResume(t *testing.T) {`
	`2043`	`+func TestPauseResume_Isolated(t *testing.T) {`
`2044`	`2044`	`prepareIntegTest(t)`
`2045`	`2045`
`2046`	`2046`	`client, err := containerd.New(containerdSockPath, containerd.WithDefaultRuntime(firecrackerRuntime))`
`@@ -2152,6 +2152,10 @@ func TestPauseResume(t *testing.T) {`
`2152`	`2152`	`// Ensure the response fields are populated correctly`
`2153`	`2153`	`assert.Equal(t, request.VMID, resp.VMID)`
`2154`	`2154`
	`2155`	`+ // Currently StopVM doesn't work when the VM is paused, since StopVM calls its in-VM agent.`
	`2156`	`+ _, err = fcClient.ResumeVM(ctx, &proto.ResumeVMRequest{VMID: request.VMID})`
	`2157`	`+ require.Equal(t, status.Code(err), codes.OK)`
	`2158`	`+`
`2155`	`2159`	`_, err = fcClient.StopVM(ctx, &proto.StopVMRequest{VMID: request.VMID})`
`2156`	`2160`	`require.Equal(t, status.Code(err), codes.OK)`
`2157`	`2161`	`}`