Skip to content

Commit 972f5b3

Browse files
committed
Run TestPauseResume_Isolated's subtests in parallel
TestPauseResume_Isolated takes roughly 90 seconds on m5d.metal. Running all subtests in parallel will make the test faster. Signed-off-by: Kazuyoshi Kato <[email protected]>
1 parent 361b8ff commit 972f5b3

File tree

1 file changed

+12
-23
lines changed

1 file changed

+12
-23
lines changed

runtime/service_integ_test.go

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2057,29 +2057,25 @@ func TestPauseResume_Isolated(t *testing.T) {
20572057
fcClient := fccontrol.NewFirecrackerClient(pluginClient.Client())
20582058

20592059
subtests := []struct {
2060-
name string
2061-
request *proto.CreateVMRequest
2062-
state func(ctx context.Context, resp *proto.CreateVMResponse)
2060+
name string
2061+
state func(ctx context.Context, resp *proto.CreateVMResponse)
20632062
}{
20642063
{
2065-
name: "PauseVM",
2066-
request: &proto.CreateVMRequest{},
2064+
name: "PauseVM",
20672065
state: func(ctx context.Context, resp *proto.CreateVMResponse) {
20682066
_, err := fcClient.PauseVM(ctx, &proto.PauseVMRequest{VMID: resp.VMID})
20692067
require.NoError(t, err)
20702068
},
20712069
},
20722070
{
2073-
name: "ResumeVM",
2074-
request: &proto.CreateVMRequest{},
2071+
name: "ResumeVM",
20752072
state: func(ctx context.Context, resp *proto.CreateVMResponse) {
20762073
_, err := fcClient.ResumeVM(ctx, &proto.ResumeVMRequest{VMID: resp.VMID})
20772074
require.NoError(t, err)
20782075
},
20792076
},
20802077
{
2081-
name: "Consecutive PauseVM",
2082-
request: &proto.CreateVMRequest{},
2078+
name: "Consecutive PauseVM",
20832079
state: func(ctx context.Context, resp *proto.CreateVMResponse) {
20842080
_, err := fcClient.PauseVM(ctx, &proto.PauseVMRequest{VMID: resp.VMID})
20852081
require.NoError(t, err)
@@ -2089,8 +2085,7 @@ func TestPauseResume_Isolated(t *testing.T) {
20892085
},
20902086
},
20912087
{
2092-
name: "Consecutive ResumeVM",
2093-
request: &proto.CreateVMRequest{},
2088+
name: "Consecutive ResumeVM",
20942089
state: func(ctx context.Context, resp *proto.CreateVMResponse) {
20952090
_, err := fcClient.ResumeVM(ctx, &proto.ResumeVMRequest{VMID: resp.VMID})
20962091
require.NoError(t, err)
@@ -2100,8 +2095,7 @@ func TestPauseResume_Isolated(t *testing.T) {
21002095
},
21012096
},
21022097
{
2103-
name: "PauseResume",
2104-
request: &proto.CreateVMRequest{},
2098+
name: "PauseResume",
21052099
state: func(ctx context.Context, resp *proto.CreateVMResponse) {
21062100
_, err := fcClient.PauseVM(ctx, &proto.PauseVMRequest{VMID: resp.VMID})
21072101
require.NoError(t, err)
@@ -2111,8 +2105,7 @@ func TestPauseResume_Isolated(t *testing.T) {
21112105
},
21122106
},
21132107
{
2114-
name: "ResumePause",
2115-
request: &proto.CreateVMRequest{},
2108+
name: "ResumePause",
21162109
state: func(ctx context.Context, resp *proto.CreateVMResponse) {
21172110
_, err := fcClient.ResumeVM(ctx, &proto.ResumeVMRequest{VMID: resp.VMID})
21182111
require.NoError(t, err)
@@ -2164,18 +2157,14 @@ func TestPauseResume_Isolated(t *testing.T) {
21642157

21652158
for _, subtest := range subtests {
21662159
state := subtest.state
2167-
request := subtest.request
21682160
t.Run(subtest.name, func(t *testing.T) {
2169-
runTest(t, request, state)
2161+
t.Parallel()
2162+
runTest(t, &proto.CreateVMRequest{}, state)
21702163
})
21712164

2172-
requestWithJailer := subtest.request
2173-
requestWithJailer.JailerConfig = &proto.JailerConfig{
2174-
UID: 30000,
2175-
GID: 30000,
2176-
}
21772165
t.Run(subtest.name+"/Jailer", func(t *testing.T) {
2178-
runTest(t, requestWithJailer, state)
2166+
t.Parallel()
2167+
runTest(t, &proto.CreateVMRequest{JailerConfig: &proto.JailerConfig{UID: 30000, GID: 30000}}, state)
21792168
})
21802169
}
21812170
}

0 commit comments

Comments
 (0)